From 20b0acd71035655c35f10a5ed60a1416a934b1f0 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Wed, 24 Sep 2014 22:02:09 +0100 Subject: [PATCH] Alter sequence --- install-freedombone.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/install-freedombone.sh b/install-freedombone.sh index f80915c5..c09ba76d 100755 --- a/install-freedombone.sh +++ b/install-freedombone.sh @@ -1477,6 +1477,11 @@ function install_owncloud { fi return fi + # if this is exclusively a cloud setup + if [[ $SYSTEM_TYPE == "cloud" ]]; then + OWNCLOUD_DOMAIN_NAME=$DOMAIN_NAME + OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=$FREEDNS_SUBDOMAIN_CODE + fi if [ ! $OWNCLOUD_DOMAIN_NAME ]; then return fi @@ -1485,13 +1490,8 @@ function install_owncloud { return fi fi - # if this is exclusively a cloud setup - if [[ $SYSTEM_TYPE == "cloud" ]]; then - OWNCLOUD_DOMAIN_NAME=$DOMAIN_NAME - OWNCLOUD_FREEDNS_SUBDOMAIN_CODE=$FREEDNS_SUBDOMAIN_CODE - fi apt-get -y --force-yes install php5 php5-gd php-xml-parser php5-intl wget - apt-get -y --force-yesinstall php5-sqlite php5-mysql smbclient curl libcurl3 php5-curl + apt-get -y --force-yes install php5-sqlite php5-mysql smbclient curl libcurl3 php5-curl if [ ! -d /var/www/$OWNCLOUD_DOMAIN_NAME ]; then mkdir /var/www/$OWNCLOUD_DOMAIN_NAME