diff options
| author | nachoparker <nacho@ownyourbits.com> | 2020-12-13 05:48:19 +0300 |
|---|---|---|
| committer | nachoparker <nacho@ownyourbits.com> | 2020-12-13 05:48:22 +0300 |
| commit | 42fd597e8beb05b420cec38786f16863570b5f71 (patch) | |
| tree | bb25c9d7a1e5e1ef0aab4e115c5c53834b1c1329 /bin/ncp-update-nc | |
| parent | ffd0b449e19e00ab9b44294b142addb274d80d1b (diff) | |
nc-update-nc: improve error messagesv1.33.1
Signed-off-by: nachoparker <nacho@ownyourbits.com>
Diffstat (limited to 'bin/ncp-update-nc')
| -rwxr-xr-x | bin/ncp-update-nc | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/bin/ncp-update-nc b/bin/ncp-update-nc index fa86bbfc..2f41d4a3 100755 --- a/bin/ncp-update-nc +++ b/bin/ncp-update-nc @@ -6,7 +6,7 @@ # GPL licensed (see end of file) * Use at your own risk! # # Usage: -# bash ncp-update-nc <version> +# ncp-update-nc <version> # # More at https://ownyourbits.com # @@ -20,13 +20,15 @@ set -eE VER="$1" +BIN="${0##*/}" # pre-checks #################### +[[ "$VER" == "" ]] && { echo "Usage ${BIN} <version>"; exit 1; } [[ -f /.docker-image ]] && BASEDIR=/data || BASEDIR=/var/www cd "$BASEDIR" DATADIR="$( grep datadirectory nextcloud/config/config.php | awk '{ print $3 }' | grep -oP "[^']*[^']" | head -1 )" -[[ -d /var/www/nextcloud-old ]] && { echo "Nextcloud backup directory found. Interrupted installation?"; exit 1; } +[[ -d /var/www/nextcloud-old ]] && { echo "Nextcloud backup directory found. Interrupted or already running installation?"; exit 1; } [[ -d /var/www/nextcloud ]] || { echo "Nextcloud directory not found" ; exit 1; } [[ -d "$DATADIR" ]] || { echo "Nextcloud data directory not found" ; exit 1; } [[ "$(stat -fc%T "$BASEDIR")" == "btrfs" ]] && { echo "BTRFS not supported" ; exit 1; } @@ -56,7 +58,7 @@ elif [ "$MAJOR" -eq "$MAJ" ] && [ "$MINOR" -gt "$MIN" ]; then elif [ "$MAJOR" -eq "$MAJ" ] && [ "$MINOR" -eq "$MIN" ] && [ "$PATCH" -gt "$PAT" ]; then NEED_UPDATE=true fi - + echo "Current Nextcloud version $CURRENT" echo "Available Nextcloud version $VER" [[ "$NEED_UPDATE" == "true" ]] || { echo "Nothing to update"; exit 1; } @@ -179,9 +181,10 @@ find nextcloud/ -type f -exec chmod 640 {} \; echo "Upgrade..." ncc='sudo -u www-data php nextcloud/occ' $ncc upgrade # && false # test point -$ncc db:add-missing-indices +$ncc | grep -q db:add-missing-indices && $ncc db:add-missing-indices $ncc | grep -q db:add-missing-columns && $ncc db:add-missing-columns $ncc | grep -q db:add-missing-primary-keys && $ncc db:add-missing-primary-keys +$ncc | grep -q db:convert-filecache-bigint && $ncc db:convert-filecache-bigint # done #################### |