|
@@ -6385,7 +6385,7 @@ function install_owncloud_repo_music_app {
|
6385
|
6385
|
return
|
6386
|
6386
|
fi
|
6387
|
6387
|
|
6388
|
|
- if ! grep -Fxq "install_owncloud_repo" $COMPLETION_FILE; then
|
|
6388
|
+ if ! grep -Fxq "install_owncloud_from_repo" $COMPLETION_FILE; then
|
6389
|
6389
|
echo $'Tried to install the Owncloud music app, but Owncloud installation was not found'
|
6390
|
6390
|
exit 9823
|
6391
|
6391
|
fi
|
|
@@ -6523,7 +6523,7 @@ function upgrade_owncloud {
|
6523
|
6523
|
/var/www/${OWNCLOUD_DOMAIN_NAME}/htdocs/occ files:scan $USRNAME
|
6524
|
6524
|
fi
|
6525
|
6525
|
done
|
6526
|
|
-
|
|
6526
|
+
|
6527
|
6527
|
# TODO enable this once upgrade is confirmed working
|
6528
|
6528
|
#apt-get -y remove --purge owncloud
|
6529
|
6529
|
#rm -rf /etc/owncloud
|
|
@@ -6564,7 +6564,7 @@ function install_owncloud_from_repo {
|
6564
|
6564
|
|
6565
|
6565
|
# update to a new commit if needed
|
6566
|
6566
|
set_repo_commit $OWNCLOUD_PATH "Owncloud commit" "$OWNCLOUD_COMMIT" $OWNCLOUD_REPO
|
6567
|
|
-
|
|
6567
|
+
|
6568
|
6568
|
OWNCLOUD_COMPLETION_MSG1=$" *** ${PROJECT_NAME} $SYSTEM_TYPE is now installed ***"
|
6569
|
6569
|
OWNCLOUD_COMPLETION_MSG2=$"Open $OWNCLOUD_DOMAIN_NAME in a web browser to complete the setup"
|
6570
|
6570
|
if grep -Fxq "install_owncloud_from_repo" $COMPLETION_FILE; then
|
|
@@ -6623,7 +6623,7 @@ function install_owncloud_from_repo {
|
6623
|
6623
|
else
|
6624
|
6624
|
sed -i "s/Owncloud commit.*/Owncloud commit:$OWNCLOUD_COMMIT/g" $COMPLETION_FILE
|
6625
|
6625
|
fi
|
6626
|
|
-
|
|
6626
|
+
|
6627
|
6627
|
install_mariadb
|
6628
|
6628
|
get_mariadb_password
|
6629
|
6629
|
|