Merge pull request hestiacp#1651 from hestiacp/fix/2021-03-issues-rainloop

Fix/2021 03 issues rainloop

Author: ScIT-Raphael

bin/v-add-sys-rainloop

@@ -14,7 +14,7 @@ source $HESTIA/func/main.sh
 source $HESTIA/conf/hestia.conf
 source $HESTIA/install/upgrade/upgrade.conf
 
-MODE=$2
+MODE=$1
 UPDATE="no"
 # Version and Download paths
 # Version to be moved to upgrade script
@@ -54,7 +54,7 @@ fi
 if [ -f "/var/lib/rainloop/data/VERSION" ]; then
     version=$(cat $RL_INSTALL_DIR/data/VERSION);
     if [ "$version" == "$rl_v" ]; then
-        echo "Error: Installed version ($version) is equal as the availble version ($rc_v)"
+        echo "Error: Installed version ($version) is equal as the availble version ($rl_v)"
         exit 2;
     else 
         UPDATE="yes"
@@ -88,7 +88,7 @@ if [ "$UPDATE" == "no" ]; then
     echo "Password: $admin_password" >> ~/.rainloop
     echo "Secret key: admin_$key" >> ~/.rainloop
 
-    unzip -q $RL_FILE
+    unzip -q ${RL_INSTALL_DIR}/${RL_FILE}
 
     mv ./data $RL_CONFIG_DIR/
     ln -s $RL_CONFIG_DIR/data/ ./data
@@ -151,8 +151,17 @@ if [ "$UPDATE" == "no" ]; then
 
 else
    [ ! -f "${RC_INSTALL_DIR}/${RC_FILE}" ] && wget "$RL_URL" --quiet -O "${RL_INSTALL_DIR}/${RL_FILE}"
-   unzip -q -o $RL_FILE
-   rm $RL_INSTALL_DIR/$RL_FILE
+   version=$(cat $RL_INSTALL_DIR/data/VERSION);
+   
+   unzip -q -j rainloop-community-latest.zip "data/VERSION" -d $RL_INSTALL_DIR/ 
+   version_source=$(cat $RL_INSTALL_DIR/VERSION);
+   
+   # Check version inside .zip file in case hestia didn't update yet
+   if [ "$version" != "$version_source" ]; then 
+       unzip -q ${RL_INSTALL_DIR}/${RL_FILE}
+       rm $RL_INSTALL_DIR/$RL_FILE
+    fi
+    rm ${RL_INSTALL_DIR}/VERSION
 fi
 
 #----------------------------------------------------------#

install/hst-install-debian.sh

@@ -25,7 +25,7 @@ VERBOSE='no'
 # Define software versions
 HESTIA_INSTALL_VER='1.4.0~alpha'
 pma_v='5.1.0'
-rc_v="1.4.10"
+rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")
 fpm_v="7.4"
 mariadb_v="10.5"

install/hst-install-ubuntu.sh

@@ -25,7 +25,7 @@ VERBOSE='no'
 # Define software versions
 HESTIA_INSTALL_VER='1.4.0~alpha'
 pma_v='5.1.0'
-rc_v="1.4.10"
+rc_v="1.4.11"
 multiphp_v=("5.6" "7.0" "7.1" "7.2" "7.3" "7.4" "8.0")
 fpm_v="7.4"
 mariadb_v="10.5"

install/upgrade/upgrade.conf

@@ -52,8 +52,8 @@ UPGRADE_RESTART_SERVICES='true'
 pma_v='5.1.0'
 
 # Set version of RoundCube (Webmail) to update during upgrade if not already installed
-# Note: only aplies to "non-apt installs >= 1.4.0 or manualy phased out"
-rc_v="1.4.10"
+# Note: only applies to "non-apt installs >= 1.4.0 or manually phased out"
+rc_v="1.4.11"
 
 # Set version of Rainloop (Webmail) to update during upgrade if not already installed
-rl_v="1.14.0"
+rl_v="1.15.0"