free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

More checking for owncloud install

This commit is contained in:
Bob Mottram 2015-01-26 20:55:06 +00:00
parent 8cffb391b3
commit 2b582987b4
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/freedombone
View File

@ -39,10 +39,6 @@ FREEDOMBONE_WEBSITE="http://freedombone.uk.to"
# Contact details # Contact details
FREEDOMBONE_BITMESSAGE="BM-2cWuhmBvVdfrHhLoZTdspCkKeiTorUesSL" FREEDOMBONE_BITMESSAGE="BM-2cWuhmBvVdfrHhLoZTdspCkKeiTorUesSL"
DOMAIN_NAME=
MY_USERNAME=
SYSTEM_TYPE=
# Are we installing on a Beaglebone Black (BBB) or some other system? # Are we installing on a Beaglebone Black (BBB) or some other system?
INSTALLING_ON_BBB="no" INSTALLING_ON_BBB="no"
@ -61,6 +57,10 @@ VARIANT_SOCIAL="social"
VARIANT_MEDIA="media" VARIANT_MEDIA="media"
VARIANT_TOR_DONGLE="tordongle" VARIANT_TOR_DONGLE="tordongle"
DOMAIN_NAME=
MY_USERNAME=
SYSTEM_TYPE=$VARIANT_FULL
# An optional configuration file which overrides some of these variables # An optional configuration file which overrides some of these variables
CONFIGURATION_FILE="freedombone.cfg" CONFIGURATION_FILE="freedombone.cfg"
@ -6168,7 +6168,7 @@ function install_owncloud_music_app {
return return
fi fi
if ! grep -Fxq "install_owncloud" $COMPLETION_FILE; then if ! grep -Fxq "install_owncloud" $COMPLETION_FILE; then
echo 'Tried to install the Owncloud music app, but Owncloud installation was not found' echo 'Tried to install the Owncloud music app, but Owncloud installation was not found'
exit 9823 exit 9823
fi fi
@ -6253,11 +6253,13 @@ function install_owncloud {
OWNCLOUD_DOMAIN_NAME=$DOMAIN_NAME OWNCLOUD_DOMAIN_NAME=$DOMAIN_NAME
fi fi
if [ ! $OWNCLOUD_DOMAIN_NAME ]; then if [ ! $OWNCLOUD_DOMAIN_NAME ]; then
return echo 'No Owncloud domain name was specified'
exit 3095
fi fi
if ! [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then if [[ $SYSTEM_TYPE != "$VARIANT_CLOUD" ]]; then
if [ $SYSTEM_TYPE ]; then if [[ $SYSTEM_TYPE != "$VARIANT_FULL" ]]; then
return echo "Owncloud install did not recognise the system type $SYSTEM_TYPE"
exit 6746
fi fi
fi fi
apt-get -y --force-yes install owncloud apt-get -y --force-yes install owncloud