diff --git a/.templates/00-smb_mounts.sh b/.templates/00-smb_mounts.sh index a8cac3ce1..15f7d529c 100644 --- a/.templates/00-smb_mounts.sh +++ b/.templates/00-smb_mounts.sh @@ -63,7 +63,7 @@ if bashio::config.has_value 'networkdisks'; then # if Fail test different smb and sec versions if [ "$MOUNTED" = false ]; then - + # Test with domain, remove otherwise #################################### for DOMAINVAR in "$DOMAIN" ",domain=WORKGROUP" ""; do @@ -85,16 +85,16 @@ if bashio::config.has_value 'networkdisks'; then for SECVERS in "" ",sec=ntlm" ",sec=ntlmv2" ",sec=ntlmv2i" ",sec=ntlmssp" ",sec=ntlmsspi" ",sec=krb5i" ",sec=krb5"; do if [ "$MOUNTED" = false ]; then mount -t cifs -o "rw,file_mode=0775,dir_mode=0775,username=$CIFS_USERNAME,password=${CIFS_PASSWORD}$SMBVERS$SECVERS$PUIDPGID$CHARSET$DOMAINVAR" "$disk" /mnt/"$diskname" 2>/dev/null \ - && MOUNTED=true && MOUNTOPTIONS="$SMBVERS$SECVERS$PUIDPGID$CHARSET$DOMAINVAR" || MOUNTED=false + && MOUNTED=true && MOUNTOPTIONS="$SMBVERS$SECVERS$PUIDPGID$CHARSET$DOMAINVAR" || MOUNTED=false fi done - + done - + done - + done - + done fi diff --git a/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh b/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh index cf254d13b..31593e5dc 100755 --- a/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh +++ b/nextcloud/rootfs/etc/cont-init.d/02-init_steps.sh @@ -53,7 +53,7 @@ if [[ $($LAUNCHER -V 2>&1) == *"not installed"* ]] || [ ! -f /data/config/www/ne bashio::log.green " " touch /notinstalled exit 0 -# Is there missing files + # Is there missing files elif [[ $($LAUNCHER -V 2>&1) == *"Composer autoloader not found"* ]] || [[ $($LAUNCHER -V 2>&1) == *"No such file"* ]] ; then bashio::log.red "--------------------------------------------------" bashio::log.red " Missing files detected, Nextcloud will reinstall " @@ -63,13 +63,13 @@ elif [[ $($LAUNCHER -V 2>&1) == *"Composer autoloader not found"* ]] || [[ $($LA sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:repair-share-owner" sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ upgrade" sudo -u abc -s /bin/bash -c "php /data/config/www/nextcloud/occ maintenance:mode --off" -# Everything is fine + # Everything is fine elif [[ $($LAUNCHER -V 2>&1) =~ ^"Nextcloud "[0-9].* ]]; then # Log bashio::log.green "----------------------------------------" bashio::log.green " Nextcloud $CURRENTVERSION is installed " bashio::log.green "----------------------------------------" -# Tentative to downgrade + # Tentative to downgrade elif [[ $($LAUNCHER -V 2>&1) == *"Downgrading"* ]]; then # Get currently installed version version="$($LAUNCHER -V 2>&1)"