diff --git a/update_nextcloud.sh b/update_nextcloud.sh index 7026819..e41a188 100755 --- a/update_nextcloud.sh +++ b/update_nextcloud.sh @@ -396,16 +396,40 @@ else [[ -n "$HTTP_GROUP" ]] || HTTP_GROUP=$DEFAULT_HTTP_GROUP fi +# --- + +INSTALL_DIR="${WEB_BASE_DIR}/nextcloud-${VERSION}" +CURRENT_INSTALL_DIR="$(realpath ${WEB_BASE_DIR}/nextcloud)" + +PRIOR_VERSION="$(basename $CURRENT_INSTALL_DIR | cut -d"-" -f2)" + +DATA_DIR=${WEB_BASE_DIR}/data-${VERSION} +CURRENT_DATA_DIR="$(realpath ${WEB_BASE_DIR}/data-$PRIOR_VERSION)" + +#_CURRENT_DATA_DIR="$(grep datadirectory "${CURRENT_INSTALL_DIR}/config/config.php" 2> /dev/null \ +# | awk '{print$3}' \ +# | tr -d "'" \ +# | tr -d ",")" +# +#CURRENT_DATA_DIR="$(realpath ${_CURRENT_DATA_DIR})" + echo "" echo -e "\033[1;32mStarting Nextcloud Update for \033[1;37m${WEBSITE}\033[m" echo "" -echo -e " Nextcloud verion.....................: $VERSION" +echo -e " New Nextcloud version................: $VERSION" +echo -e " Old Nextcloud version................: $PRIOR_VERSION" echo "" echo -e " Website to update....................: $WEBSITE" echo "" echo -e " Web base directory...................: $WEB_BASE_DIR" echo "" +echo -e " New Installation directory...........: $INSTALL_DIR" +echo -e " Old Installation directory...........: $CURRENT_INSTALL_DIR" +echo "" +echo -e " New Data directory...................: $DATA_DIR" +echo -e " Old Data directory...................: $CURRENT_DATA_DIR" +echo "" echo -e " Source directory for tar archiv......: $SRC_BASE_DIR" echo "" echo -e " Webserver user.......................: $HTTP_USER" @@ -437,12 +461,6 @@ fi echo "" -CURRENT_INSTALL_DIR=`realpath ${WEB_BASE_DIR}/nextcloud` -CURRENT_DATA_DIR=`realpath ${WEB_BASE_DIR}/data` -PRIOR_VERSION=`basename $CURRENT_INSTALL_DIR | cut -d"-" -f2` - -DATA_DIR=${WEB_BASE_DIR}/data-${VERSION} -INSTALL_DIR=${WEB_BASE_DIR}/nextcloud-${VERSION} # ----- @@ -708,6 +726,18 @@ else fi +# - Set Parameter 'datadirectory' to '${DATA_DIR}' .." +# - +echononl " Set Parameter 'datadirectory' to '${DATA_DIR}'" +perl -i -n -p -e "s#^(\s*'datadirectory').*#\1 => '${DATA_DIR}',#" ${INSTALL_DIR}/config/config.php > $log_file 2>&1 +if [[ $? -eq 0 ]]; then + echo_ok +else + echo_failed + error "$(cat $log_file)" +fi + + # - Backup old installation directory # - echononl " Backup old installation directory"