WebSVN – ALCASAR – Path Comparison – /

Ignore whitespace Rev 3162 → Rev 3163

 /scripts/alcasar-conf.sh
 ,8 → 122,12
 ##           Load an archive conf file           ##
 ###################################################
         --load|-load)
+                if [ ! -f /var/tmp/alcasar-conf.tar.gz ]; then
+                        echo "Conf file not found (/var/tmp/alcasar-conf.tar.gz) !"
+                        return 1
+                fi
                 CURRENT_DIR=`pwd`  # install folder
-                cd /var/tmp || { echo "Unable to find /var/tmp directory"; }
+                cd /var/tmp
                 tar -xf alcasar-conf.tar.gz
 # update alcasar.conf parameters
                 PREVIOUS_VERSION=`grep ^VERSION= $DIR_UPDATE/etc/alcasar.conf|cut -d"=" -f2`

 /scripts/alcasar-letsencrypt.sh
 ,16 → 188,16
 ################################################################################
 install_cert() {
         echo "Importing certificate to ALCASAR..."
-        if [ ! -f $ACMESH_HOME/certs/"$DOMAIN"/"$DOMAIN".cer ]; then
+        LE_cert_folder="$( echo "$ACMESH_HOME/certs/$DOMAIN"*"")"
+        if [ ! -f $LE_cert_folder"/"$DOMAIN.cer ]; then
                 echo "Certificate not found."
                 return 1
         fi
         /usr/local/bin/alcasar-importcert.sh \
-                -i $ACMESH_HOME/certs/"$DOMAIN"_ecc/"$DOMAIN".cer \
-                -k $ACMESH_HOME/certs/"$DOMAIN"_ecc/"$DOMAIN".key \
-                -c $ACMESH_HOME/certs/"$DOMAIN"_ecc/fullchain.cer \
+                -i $LE_cert_folder"/"$DOMAIN.cer \
+                -k $LE_cert_folder"/"$DOMAIN.key \
+                -c $LE_cert_folder/fullchain.cer \
                 > /dev/null 2>&1
         if [ $? -ne 0 ]; then