global linux installer update

* installer now expects a tar.gz archive
* omnibot archive is now installed separately
* can download with axel, curl or wget
* added some colors

linux/etlegacy-linux-full-installer.sh

@@ -1,86 +1,155 @@
 #!/bin/bash
-#
-# Put this script into your $HOME path or any desired folder.
-# Change permission to execute and run the script.
-# It'll download and install the whole ET:Legacy universe. Hf!
 
+#
+# ET:Legacy Linux full installer - Download and install the whole ET:Legacy universe. Hf!
+#
+# - Put this script into your $HOME path or any desired folder.
+# - Change permission to execute and run the script.
+#
 # Important notes:
-#
+# - Don't try to overwrite previous ET: Legacy versions - it won't work!
-# -- Don't try to overwrite previous ET: Legacy versions - it won't work!
+# - This is a 32 bit application - if you start ET:L and a 'file not found error'
-#
+#   is thrown ensure your system supports executing 32 bit applications
-# -- This is a 32 bit application - if you start ET:L and a 'file not found error'
-#    is thrown ensure your system supports executing 32 bit applications
 
 # TODO: 
-# - Add some mirrors ...
+# - Add some mirrors
-# - Ask for intstall folder
 
-{ echo "***********************************************************************"; } &&
+version="2.71rc4"
-{ echo "     ET:Legacy linux full installer script V1.03 for ET:L 2.71 RC3"; } &&
-{ echo "***********************************************************************"; } &&
-{ echo "ET:Legacy is published under"; } &&
-{ echo "GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007"; } &&
-{ echo "See http://www.gnu.org/licenses/gpl-3.0"; } &&
-{ echo "***********************************************************************"; } &&
-{ echo "Do you accept our licence ? [y/n]"; }
 
-read ACCEPT
+checksums=`mktemp`
-if [ $ACCEPT = "y" ]
+cat >$checksums <<'EOF'
-  then
+b14283e390b3ff7ef1a4a58c0ec1fa1dabfb9a658c8e8824f0cc842e0ab6d76e  etlegacy-linux-2.71rc4.tar.gz
-  { echo "... Preparing installation ..."; }
-else
-  unset ACCEPT
-  exit
-fi
-unset ACCEPT
-
-# Fetch files
-    { echo "... Fetching about 260 MB game data files - this may take a while ..."; }
-    wget http://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/et/linux/et-linux-2.60.x86.run
-    { echo "... Fetching  about 25 MB ET:Legacy files - it won't take long ..."; }
-    wget http://mirror.etlegacy.com/etlegacy-linux-2.71rc3.zip
-
-# Compare downloaded files against checksums
-    { echo "... Checking downloaded files ..."; }
-    checksums=`mktemp`
-    cat >$checksums <<'EOF'
 41cbbc1afb8438bc8fc74a64a171685550888856005111cbf9af5255f659ae36  et-linux-2.60.x86.run
-9441e91c3c066af15527eead0aed9c65ac2022b7017977173ecb4b3f6b5f54e9  etlegacy-linux-2.71rc3.zip
+edbcff363836cc5e9f298dc40ab86b63cc5d8ed9d0f99967e868c13a42ff3c55  omnibot-linux-latest.tar.gz
 EOF
-    sha256sum -c $checksums || exit
 
-    { echo "... Installing ET:Legacy ..."; }
+#
+# Tools
+#
+
+reset="\e[0m"
+colorR="\e[1;31m"
+colorG="\e[1;32m"
+colorY="\e[1;33m"
+colorB="\e[1;34m"
+
+note() {
+    case "$1" in
+        i) echo -e "${colorB}::${reset} $2";;   # info
+        s) echo -e "${colorG}::${reset} $2";;   # success
+        w) echo -e "${colorY}::${reset} $2";;   # question
+        e) echo -e "${colorR}::${reset} $2";    # error
+            exit 1;;
+    esac
+}
+
+proceed() {
+    case $1 in
+        y)  printf "${colorY}%s${reset} ${colorW}%s${reset}" "::" $"$2 [Y/n] "
+            read -n 1 answer
+            echo
+            case $answer in
+                Y|y|'') return 0;;
+                *) return 1;;
+            esac;;
+        n)  printf "${colorY}%s${reset} ${colorW}%s${reset}" "::" $"$2 [y/N] "
+            read -n 1 answer
+            echo
+            case $answer in
+                N|n|'') return 0;;
+                *) return 1;;
+            esac;;
+    esac
+}
+
+downloader() {
+    if [ -f /usr/bin/axel  ]; then
+        axel $1
+    elif [ -f /usr/bin/curl  ]; then
+        curl -O $1
+    else
+        wget $1
+    fi
+}
+
+#
+# Main
+#
+
+echo -e "${colorB}***********************************************************************${reset}"
+echo -e "           Enemy Teritorry: Legacy ${colorG}$version${reset} Linux full installer"
+echo -e "${colorB}***********************************************************************${reset}"
+echo
+
+# license
+note i "ET:Legacy is published under the GNU GPLv3 license"
+note i "See http://www.gnu.org/licenses/gpl-3.0"
+note i ""
+note i "W:ET assets are still covered by the original EULA"
+echo
+
+if ! proceed "y" "Do you agree with the licenses ?"; then
+    note e "Installation exited"
+fi
+
+# download
+note i "Preparing installation..."
+
+if [ ! -f et-linux-2.60.x86.run ]; then
+    note i "Fetching W:ET assets data files..."
+    downloader http://ftp.gwdg.de/pub/misc/ftp.idsoftware.com/idstuff/et/linux/et-linux-2.60.x86.run
+fi
+if [ ! -f etlegacy-linux-${version}.tar.gz ]; then
+    note i "Fetching ET:Legacy files..."
+    downloader http://mirror.etlegacy.com/etlegacy-linux-${version}.tar.gz
+fi
+if [ ! -f omnibot-linux-latest.tar.gz ]; then
+    note i "Fetching Omni-Bot files..."
+    downloader http://mirror.etlegacy.com/omnibot/omnibot-linux-latest.tar.gz
+fi
+
+# checksum
+note i "Checking downloaded files..."
+
+    sha256sum -c $checksums || note e "Integrity check failed"
+
+# installation
+note i "Installing..."
 
-# Permissions
     chmod +x et-linux-2.60.x86.run
 
-# Extract
     ./et-linux-2.60.x86.run --noexec --target etlegacy
-    { echo "Uncompressing ET:Legacy 2.71 RC3"; }
-    unzip -q etlegacy-linux-2.71rc3.zip -d etlegacy
-
-# Remove junk
     rm -rf etlegacy/{bin,Docs,README,pb,openurl.sh,CHANGES,ET.xpm} etlegacy/setup.{data,sh} etlegacy/etmain/*.cfg
     rm -f  etlegacy/legacy/omni-bot/omnibot_et.dll
 
-# Do some final stuff
+    cd etlegacy
-    chmod -f 755 etlegacy/etl
+    tar -zxvf ../etlegacy-linux-${version}.tar.gz
-    chmod -f 755 etlegacy/etlded
-    chmod -f 755 etlegacy/etlded_bot.sh
-    chmod -f 755 etlegacy/etl_bot.sh
-    chmod -f 664 etlegacy/legacy/omni-bot/et/user/omni-bot.cfg
 
-# Ask for removal of .run
+    chmod -f 755 etl
-    { echo "Remove game data file archive? [y/n]  - You don't need that anymore"
+    chmod -f 755 etlded
-    rm -i et-linux-2.60.x86.run; } &&
+    chmod -f 755 etlded_bot.sh
+    chmod -f 755 etl_bot.sh
 
-# Ask for removal of etlegacy archive
+    cd legacy
-    { echo "Remove ET:Legacy archive? [y/n] - You don't need this either"
+    tar -zxvf ../../omnibot-linux-latest.tar.gz
-    rm -i etlegacy-linux-2.71rc3.zip; } &&
+    chmod -f 664 omni-bot/et/user/omni-bot.cfg
 
-# End
+    cd ../..
-{ echo "***********************************************************************"; } &&
+
-{ echo "                 Thank you for installing ET:Legacy"; } &&
+note s "Installation successful!"
-{ echo "***********************************************************************"; } &&
+
-{ echo "      Visit us: http://www.etlegacy.com IRC #etlegacy@freenode.irc"; } &&
+# cleaning
-{ echo "***********************************************************************"; }
+echo
+if ! proceed "n" "Remove downloaded files archive?"; then
+    rm -i et-linux-2.60.x86.run
+    rm -i etlegacy-linux-${version}.tar.gz
+    rm -i omnibot-linux-latest.tar.gz
+fi
+
+# end
+echo
+echo -e "${colorB}***********************************************************************${reset}"
+echo -e "                 ${colorR}Thank you for installing ET:Legacy${reset}"
+echo -e "${colorB}***********************************************************************${reset}"
+echo -e "      Visit us on ${colorY}www.etlegacy.com${reset} and ${colorY}IRC #etlegacy@freenode.net${reset}"
+echo -e "${colorB}***********************************************************************${reset}"