diff --git a/Jamrules b/Jamrules index 4874276270..87bdb20449 100644 --- a/Jamrules +++ b/Jamrules @@ -2113,8 +2113,8 @@ rule PackageZip } actions together PackageZip1 { - cd $(OBOS_PACKAGE_DIR) ; - zip -rq $(1:BS) $(2:BS) ; + cd "$(OBOS_PACKAGE_DIR)" ; + zip -rq "$(1:BS)" "$(2:BS)" ; } rule PackageInstallScript @@ -2128,27 +2128,27 @@ actions together PackageInstallScript1 { echo '#!/bin/sh base=`dirname "$0"` -cd $base +cd "$base" if [ -n "$TTY" ] then - unzip -d / install.zip + unzip -d / install.zip else - response=`alert "Would you like to automatically overwrite existing files, or receive a prompt?" "Overwrite" "Prompt"` - if [ $response == "Overwrite" ] - then - unzip -od / install.zip - alert "Finished installing" "Thanks" - else - if [ -e /boot/beos/apps/Terminal ] - then - terminal=/boot/beos/apps/Terminal - else - terminal=`query Terminal | head -1` - fi - $terminal -t "installer" /bin/sh $0 - fi -fi' > $(1) ; - chmod 755 $(1) ; + response=`alert "Would you like to automatically overwrite existing files, or receive a prompt?" "Overwrite" "Prompt"` + if [ $response == "Overwrite" ] + then + unzip -od / install.zip + alert "Finished installing" "Thanks" + else + if [ -e /boot/beos/apps/Terminal ] + then + terminal=/boot/beos/apps/Terminal + else + terminal=`query Terminal | head -1` + fi + $terminal -t "installer" /bin/sh "$0" + fi +fi' > "$(1)" ; + chmod 755 "$(1)" ; } rule PackageInstallZip @@ -2159,8 +2159,8 @@ rule PackageInstallZip actions together PackageInstallZip { - cd $(1:P) ; - zip -rqy $(1:BS) boot ; + cd "$(1:P)" ; + zip -rqy "$(1:BS)" boot ; } rule LinkInstallZip @@ -2171,5 +2171,5 @@ rule LinkInstallZip actions together LinkInstallZip { - ln -sf `pwd`/"$(2)" "$(1)" ; + ln -sf "`pwd`/$(2)" "$(1)" ; }