Fix macos install order

Jendker · Oct 1, 2024 · 031f1d4 · 031f1d4
1 parent 98b520c
commit 031f1d4
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/dotfiles_private b/dotfiles_private
diff --git a/scripts/install.sh b/scripts/install.sh
@@ -86,6 +86,7 @@ if ! [ -x "$(command -v stow)" ]; then
     brew install stow
   else
     echo "Unsupported OS"
+    exit 1
   fi
 fi
 
@@ -97,6 +98,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
   echo '\.DS_Store' >"$HOME/.stow-global-ignore"
 else
   echo "Unsupported OS"
+  exit 1
 fi
 
 if [[ $install_only != true ]]; then
@@ -109,20 +111,6 @@ if [[ $install_only != true ]]; then
   cd ..
 fi
 
-if [[ $stow_only != true ]]; then
-  # Platform-specific config install
-  if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    "${SCRIPT_DIR}/debian/install_min.sh"
-    if [[ $dev == true ]]; then
-      "${SCRIPT_DIR}/debian/install.sh" --optional
-    fi
-  elif [[ "$OSTYPE" == "darwin"* ]]; then
-    "${SCRIPT_DIR}/macos/install.sh"
-  else
-    echo "Unsupported OS"
-  fi
-fi
-
 # Private submodule install
 SUBMODULE_PATH="dotfiles_private"
 # Check if the submodule is not empty
@@ -139,3 +127,18 @@ if [[ -n "$(ls -A ${SUBMODULE_PATH})" ]]; then
 else
   echo "Private submodule is not cloned. Skipping installation."
 fi
+
+if [[ $stow_only != true ]]; then
+  # Platform-specific config install
+  if [[ "$OSTYPE" == "linux-gnu"* ]]; then
+    "${SCRIPT_DIR}/debian/install_min.sh"
+    if [[ $dev == true ]]; then
+      "${SCRIPT_DIR}/debian/install.sh" --optional
+    fi
+  elif [[ "$OSTYPE" == "darwin"* ]]; then
+    "${SCRIPT_DIR}/macos/install.sh"
+  else
+    echo "Unsupported OS"
+    exit 1
+  fi
+fi
diff --git a/scripts/uninstall.sh b/scripts/uninstall.sh
@@ -26,6 +26,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then
   stow --dotfiles -D -t ~ macos
 else
   echo "Unsupported OS"
+  exit 1
 fi
 
 # Unstow common
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,6 +26,7 @@ elif [[ "$OSTYPE" == "darwin"* ]]; then @@
       stow --dotfiles -D -t ~ macos
     else
       echo "Unsupported OS"
+      exit 1
     fi
     # Unstow common
@@ Expand Down @@