Merge pull request #233 from WhitewaterFoundry/development

Development
WhitewaterFoundry · Apr 9, 2020 · 4400124 · 4400124
2 parents 512624d + fb3d494
commit 4400124
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/pengwin-setup.d/shells.sh b/pengwin-setup.d/shells.sh
@@ -70,7 +70,8 @@ EOF
   fi
 
   if (whiptail --title "zsh" --yesno "Would you like to set zsh as the default shell?" 8 55); then
-    chsh -s "$(which zsh)"
+    sudo chsh -s "$(command -v zsh)" "${USER}"
+    touch "${HOME}"/.should-restart
   fi
 }
 
@@ -95,13 +96,15 @@ function fish_install() {
   cleantmp
 
   if (confirm --title "fish" --yesno "Would you like to set fish as the default shell?" 8 55); then
-    chsh -s "$(which fish)"
+    sudo chsh -s "$(command -v fish)" "${USER}"
+    touch "${HOME}"/.should-restart
   fi
 }
 
 function cshinstall() {
   if (whiptail --title "csh" --yesno "Would you like to set csh as the default shell?" 8 55); then
-    chsh -s "$(which csh)"
+    sudo chsh -s "$(command -v csh)" "${USER}"
+    touch "${HOME}"/.should-restart
   fi
 }
 

diff --git a/pengwin-setup.d/shortcut.sh b/pengwin-setup.d/shortcut.sh
@@ -23,8 +23,10 @@ function create_shortcut() {
     cmdIcon=""
   fi
 
-  echo wslusc --name "${cmdName}" ${cmdIcon} "${gui}" "${cmdToExec}"
-  bash "${SetupDir}"/generate-shortcut.sh --name "${cmdName}" ${cmdIcon} "${gui}" "${cmdToExec}"
+  # shellcheck disable=SC2086
+  echo wslusc --name "${cmdName}" ${cmdIcon} ${gui} "${cmdToExec}"
+  # shellcheck disable=SC2086
+  bash "${SetupDir}"/generate-shortcut.sh --name "${cmdName}" ${cmdIcon} ${gui} "${cmdToExec}"
 
   mkdir -p "${DEST_PATH}"
   mv "$(wslpath "$(wslvar -l Desktop)")/${cmdName}.lnk" "${DEST_PATH}"
@@ -121,6 +123,7 @@ function create_shortcut_from_desktop() {
               /usr/share/icons/gnome/48x48/apps \
               /usr/share/icons/Adwaita/512x512/places \
               /usr/share/icons/Adwaita/256x256/devices \
+              /usr/share/icons/Adwaita/256x256/legacy \
               "${HOME}"/.local/share/icons/hicolor/256x256/apps \
               /usr/share/icons \
               -maxdepth \