simutrans get_pak.sh patch

--- get_pak.sh.orig 2012-10-22 23:09:16.000000000 +0200
+++ get_pak.sh  2012-11-08 02:37:22.000000000 +0100
@@ -3,21 +3,26 @@
 # script to fetch pak sets
 #

+# make sure that non-existing variables are not ignored
+set -u
+
+# fall back to "/tmp" if TEMP is not set
+TEMP=${TEMP:-/tmp}
+
+
 # parameter: url and filename
 do_download(){
-curl -h > /dev/null
-if [ $? -eq 0 ]; then
-    curl $1 > $2 || {
+if which curl >/dev/null; then
+    curl -L "$1" > "$2" || {
       echo "Error: download of file $2 failed (curl returned $?)" >&2
-      rm -f $2
+      rm -f "$2"
       exit 4
     }
 else
-    wget --help > /dev/null
-    if [ $? -eq 0 ]; then
-        wget -q -N $1 -O $2 || {
+    if which wget >/dev/null; then
+        wget -q -N "$1" -O "$2" || {
           echo "Error: download of file $2 failed (wget returned $?)" >&2
-          rm -f $2
+          rm -f "$2"
           exit 4
         }
     else
@@ -31,16 +36,16 @@
 # two parameter, url, zipfilename
 DownloadInstallZip(){
   echo "downloading from $1"
-  do_download $1 $TEMP/$2
+  do_download "$1" "$TEMP/$2"
   echo "installing from $2"
-  unzip -o -C -q $TEMP/$2 -d .
-  rm $TEMP/$2
+  unzip -o -C -q "$TEMP/$2" -d .
+  rm "$TEMP/$2"
 }


 # generated list of pak sets with well-formatted paking
 paksets=( \
-http://downloads.sourceforge.net/project/simutrans/pak64/112-0/simupak64-112-0.zip" \
+"http://downloads.sourceforge.net/project/simutrans/pak64/112-0/simupak64-112-0.zip" \
 "http://downloads.sourceforge.net/project/simutrans/pak.german/pak64.german-110-0c/simupak-german64-110-0c.zip" \
 "http://downloads.sourceforge.net/project/simutrans/pak64.japan/112-0/simupak64.japan-112-0.zip" \
 "http://downloads.sourceforge.net/project/simutrans/pakHAJO/pakHAJO_102-2-2/pakHAJO_0-102-2-2.zip" \
@@ -73,7 +78,7 @@
 let setcount=0
 let choicecount=0
 let "maxcount = ${#paksets[*]}"
-while [ $setcount -lt $maxcount ]; do
+while [ "$setcount" -lt "$maxcount" ]; do
       installpak[choicecount]=0
       urlname=${paksets[$setcount]}
       zipname="${urlname##http*\/}"
@@ -87,7 +92,7 @@

 let setcount=0
 let "maxcount = ${#nosimutranspaksets[*]}"
-while [ $setcount -lt $maxcount ]; do
+while [ "$setcount" -lt "$maxcount" ]; do
       installpak[choicecount]=0
       urlname=${nosimutranspaksets[$setcount]}
       zipname="${urlname##http*\/}"
@@ -96,7 +101,7 @@
       choices[choicecount]=$choicename
       let "setcount += 1"
       let "choicecount += 1"
-      echo "${choicecount}) ${choicename}"
+      echo "${choicecount} ${choicename}"
 done

 while true; do
@@ -149,24 +154,24 @@
 pushd ..
 let setcount=0
 let "maxcount = ${#paksets[*]}"
-while [ $setcount -lt $maxcount ]; do
-  if [ ${installpak[$setcount]} -gt 0 ]; then
+while [ "$setcount" -lt "$maxcount" ]; do
+  if [ "${installpak[$setcount]}" -gt 0 ]; then
     urlname=${paksets[$setcount]}
     zipname="${urlname##http*\/}"
-    DownloadInstallZip $urlname $zipname
+    DownloadInstallZip "$urlname" "$zipname"
   fi
   let "setcount += 1"
 done

 #for the wrong paksets, just change to simutrans folder
 popd
-while [ $setcount -lt $choicecount ]; do
+while [ "$setcount" -lt "$choicecount" ]; do
   if [ ${installpak[$setcount]} -gt 0 ]; then
     let "correctcount=$setcount-$maxcount]"
-    echo $correctcount
+    echo "$correctcount"
     urlname=${nosimutranspaksets[$correctcount]}
     zipname="${urlname##http*\/}"
-    DownloadInstallZip $urlname $zipname
+    DownloadInstallZip "$urlname" "$zipname"
   fi
   let "setcount += 1"
 done