Little fixs on setup.sh and launch.sh

Author: vdeville

launch.sh

@@ -1,19 +1,21 @@
 #!/usr/bin/env bash
 
-OPTION=$(dialog --title "Twitch Bot" --menu "What do you want ?" 10 78 3 \
+VERSION=1.3
+TITLE="Twitch Bot $VERSION"
+OPTION=$(dialog --title "$TITLE" --menu "What do you want ?" 10 78 3 \
 "1" "Launch the bot" \
 "2" "Launch in screen" \
 "3" "Dump autoload" 3>&1 1>&2 2>&3)
 
 STATUS=$?
-if [ $STATUS = 0 ]; then
-    case $OPTION in
+if [ ${STATUS} = 0 ]; then
+    case ${OPTION} in
     1)
       php bot.php
       ;;
     2)
       screen -Sdm twitch-bot php bot.php
-      dialog --title "Twitch Bot" --msgbox "You can re-attach the screen by typing: screen -r twitch-bot" 10 78
+      dialog --title "$TITLE" --msgbox "You can re-attach the screen by typing: screen -r twitch-bot" 10 78
       ;;
     3)
       php composer.phar dumpautoload &> /dev/null

setup.sh

@@ -1,45 +1,48 @@
 #!/usr/bin/env bash
 
+VERSION=1.3
+TITLE="Twitch Bot $VERSION"
 
 function installPhpOrDie() {
-    if (dialog --title "PHP Checks" --yes-button "Yes" --no-button "No"  --yesno "Do you want to install PHP and PHP-CURL ?" 10 78); then
+    if (dialog --title "$TITLE - PHP Checks" --yes-button "Yes" --no-button "No"  --yesno "Do you want to install PHP and PHP-CURL ?" 10 78); then
         clear
         apt-get update
-        apt-get install -y php5-cli php5-curl
+        apt-get install -y php-cli php-curl
     else
-        dialog --title "Twitch Bot" --msgbox "PHP is required to use this bot, thanks." 10 78
+        dialog --title "$TITLE" --msgbox "PHP is required to use this bot, thanks." 10 78
     fi
 }
 
 # Step 1
-dialog --title "Twitch Bot" --msgbox "
+dialog --title "$TITLE" --msgbox "
 Welcome to the installer, it checks if your system passes all requirements and configures the bot for you.
 
 Choose Ok to begin." 10 78
 
 
 # Step 2
 PHPVERSION=$(php --version 2> /dev/null | head -n 1 | cut -d " " -f 2 | cut -c 1,3);
-if [ $PHPVERSION < 56 ] || [ -z $PHPVERSION ]; then
+if [ ${PHPVERSION} < 56 ] || [ -z ${PHPVERSION} ]; then
     installPhpOrDie
 fi
 
 # Step 3
-dialog --title "Twitch Bot" --msgbox "
+dialog --title "$TITLE" --msgbox "
 The next step will download composer on getcomposer.org and install it locally
 
-Choose Ok to continue." 10 78
+Choose Ok to continue and wait." 10 78
 
 wget https://getcomposer.org/installer -O composer-setup.php &> /dev/null
 php composer-setup.php &> /dev/null
+rm composer-setup.php
 
 
 # Step 4
-dialog --title "Twitch Bot" --msgbox "
+dialog --title "$TITLE" --msgbox "
 To finish, launch composer update by pressing Ok on this step
 
 Choose Ok to continue." 10 78
 php composer.phar update &> /dev/null
 
 # Step 5
-dialog --title "Twitch Bot" --msgbox "It' done ! Installation ended successfully. You can launch the bot by typing: bash launch.sh in your terminal" 10 78
+dialog --title "$TITLE" --msgbox "It' done ! Installation ended successfully. You can launch the bot by typing: bash launch.sh in your terminal" 10 78