Browse Source

More checking for owncloud install

Bob Mottram 10 years ago
parent
commit
2b582987b4
1 changed files with 11 additions and 9 deletions
  1. 11
    9
      src/freedombone

+ 11
- 9
src/freedombone View File

39
 # Contact details
39
 # Contact details
40
 FREEDOMBONE_BITMESSAGE="BM-2cWuhmBvVdfrHhLoZTdspCkKeiTorUesSL"
40
 FREEDOMBONE_BITMESSAGE="BM-2cWuhmBvVdfrHhLoZTdspCkKeiTorUesSL"
41
 
41
 
42
-DOMAIN_NAME=
43
-MY_USERNAME=
44
-SYSTEM_TYPE=
45
-
46
 # Are we installing on a Beaglebone Black (BBB) or some other system?
42
 # Are we installing on a Beaglebone Black (BBB) or some other system?
47
 INSTALLING_ON_BBB="no"
43
 INSTALLING_ON_BBB="no"
48
 
44
 
61
 VARIANT_MEDIA="media"
57
 VARIANT_MEDIA="media"
62
 VARIANT_TOR_DONGLE="tordongle"
58
 VARIANT_TOR_DONGLE="tordongle"
63
 
59
 
60
+DOMAIN_NAME=
61
+MY_USERNAME=
62
+SYSTEM_TYPE=$VARIANT_FULL
63
+
64
 # An optional configuration file which overrides some of these variables
64
 # An optional configuration file which overrides some of these variables
65
 CONFIGURATION_FILE="freedombone.cfg"
65
 CONFIGURATION_FILE="freedombone.cfg"
66
 
66
 
6168
       return
6168
       return
6169
   fi
6169
   fi
6170
   if ! grep -Fxq "install_owncloud" $COMPLETION_FILE; then
6170
   if ! grep -Fxq "install_owncloud" $COMPLETION_FILE; then
6171
-	  echo 'Tried to install the Owncloud music app, but Owncloud installation was not found'
6171
+      echo 'Tried to install the Owncloud music app, but Owncloud installation was not found'
6172
       exit 9823
6172
       exit 9823
6173
   fi
6173
   fi
6174
 
6174
 
6253
       OWNCLOUD_DOMAIN_NAME=$DOMAIN_NAME
6253
       OWNCLOUD_DOMAIN_NAME=$DOMAIN_NAME
6254
   fi
6254
   fi
6255
   if [ ! $OWNCLOUD_DOMAIN_NAME ]; then
6255
   if [ ! $OWNCLOUD_DOMAIN_NAME ]; then
6256
-      return
6256
+      echo 'No Owncloud domain name was specified'
6257
+      exit 3095
6257
   fi
6258
   fi
6258
-  if ! [[ $SYSTEM_TYPE == "$VARIANT_CLOUD" ]]; then
6259
-      if [ $SYSTEM_TYPE ]; then
6260
-          return
6259
+  if [[ $SYSTEM_TYPE != "$VARIANT_CLOUD" ]]; then
6260
+      if [[ $SYSTEM_TYPE != "$VARIANT_FULL" ]]; then
6261
+          echo "Owncloud install did not recognise the system type $SYSTEM_TYPE"
6262
+          exit 6746
6261
       fi
6263
       fi
6262
   fi
6264
   fi
6263
   apt-get -y --force-yes install owncloud
6265
   apt-get -y --force-yes install owncloud