external/mailinabox
1
0
Fork 0
mirror of https://github.com/mail-in-a-box/mailinabox.git synced 2024-11-22 02:17:26 +00:00
Code Issues Releases Wiki Activity

fix occ upgrade to not bail when occ returns 'ownCloud is already latest version' exit code 3, see #496

Browse Source
This commit is contained in:
Joshua Tauberer 2015-07-19 13:05:04 +00:00
parent 9b9a40ddd7
commit e54608c282
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
setup/owncloud.sh
View File

@ -31,7 +31,6 @@ if [ ! -f $STORAGE_ROOT/owncloud/config.php ] \
fi fi
# Check if ownCloud dir exist, and check if version matches owncloud_ver (if either doesn't - install/upgrade) # Check if ownCloud dir exist, and check if version matches owncloud_ver (if either doesn't - install/upgrade)
DID_OWNCLOUD_UPGRADE=0
if [ ! -d /usr/local/lib/owncloud/ ] \ if [ ! -d /usr/local/lib/owncloud/ ] \
|| ! grep -q $owncloud_ver /usr/local/lib/owncloud/version.php; then || ! grep -q $owncloud_ver /usr/local/lib/owncloud/version.php; then
@ -67,9 +66,9 @@ if [ ! -d /usr/local/lib/owncloud/ ] \
# that error. # that error.
chown -f -R www-data.www-data $STORAGE_ROOT/owncloud /usr/local/lib/owncloud chown -f -R www-data.www-data $STORAGE_ROOT/owncloud /usr/local/lib/owncloud
# Run the upgrade script. # Run the upgrade script. Then check for success (0=ok, 3=no upgrade needed).
hide_output sudo -u www-data php /usr/local/lib/owncloud/occ upgrade sudo -u www-data php /usr/local/lib/owncloud/occ upgrade
DID_OWNCLOUD_UPGRADE=1 if [ \( $? -ne 0 \) -a \( $? -ne 3 \) ]; then exit 1; fi
fi fi
# ### Configuring ownCloud # ### Configuring ownCloud
@ -158,12 +157,11 @@ hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable
hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable contacts hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable contacts
hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable calendar hide_output sudo -u www-data php /usr/local/lib/owncloud/console.php app:enable calendar
if [ $DID_OWNCLOUD_UPGRADE -gt 0 ]; then # When upgrading, run the upgrade script again now that apps are enabled. It seems like
# When upgrading, run the upgrade script again now that apps are enabled. It seems like # the first upgrade at the top won't work because apps may be disabled during upgrade?
# the first upgrade at the top won't work because apps may be disabled during upgrade? # Check for success (0=ok, 3=no upgrade needed).
# This command will fail if there's nothing to upgrade. sudo -u www-data php /usr/local/lib/owncloud/occ upgrade
hide_output sudo -u www-data php /usr/local/lib/owncloud/occ upgrade if [ \( $? -ne 0 \) -a \( $? -ne 3 \) ]; then exit 1; fi
fi
# Set PHP FPM values to support large file uploads # Set PHP FPM values to support large file uploads
# (semicolon is the comment character in this file, hashes produce deprecation warnings) # (semicolon is the comment character in this file, hashes produce deprecation warnings)