Merge pull request desktop#6260 from desktop/upstream-fix-for-install…

…-scripts spaces in filenames are problematic for profile scripts
sueliitj · Dec 19, 2018 · cf99e95 · cf99e95
2 parents 2779741 + dc775fa
commit cf99e95
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/script/linux-after-install.sh b/script/linux-after-install.sh
@@ -2,15 +2,15 @@
 
 set -e
 
-PROFILE_D_FILE="/etc/profile.d/${productFilename}.sh"
+PROFILE_D_FILE="/etc/profile.d/github-desktop.sh"
 INSTALL_DIR="/opt/${productFilename}"
-SCRIPT="#!/bin/sh
-export PATH=$INSTALL_DIR:\$PATH"
+SCRIPT=$"#!/bin/sh
+export PATH=\"$INSTALL_DIR:\$PATH\""
 
 case "$1" in
     configure)
-      echo "$SCRIPT" > ${PROFILE_D_FILE};
-      . ${PROFILE_D_FILE};
+      echo "$SCRIPT" > "${PROFILE_D_FILE}";
+      . "${PROFILE_D_FILE}";
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)

diff --git a/script/linux-after-remove.sh b/script/linux-after-remove.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 set -e
 
-PROFILE_D_FILE="/etc/profile.d/${productFilename}.sh"
+PROFILE_D_FILE="/etc/profile.d/github-desktop.sh"
 
 case "$1" in
     purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-      echo "#!/bin/sh" > ${PROFILE_D_FILE};
-      . ${PROFILE_D_FILE};
-      rm ${PROFILE_D_FILE};
+      echo "#!/bin/sh" > "${PROFILE_D_FILE}";
+      . "${PROFILE_D_FILE}";
+      rm "${PROFILE_D_FILE}";
     ;;
 
     *)
@@ -16,4 +16,4 @@ case "$1" in
     ;;
 esac
 
-exit 0
+exit 0