Bob Mottram vor 7 Jahren
Ursprung
Commit
8ef9be1a6e
1 geänderte Dateien mit 21 neuen und 5 gelöschten Zeilen
  1. 21
    5
      src/freedombone-app-datserver

+ 21
- 5
src/freedombone-app-datserver Datei anzeigen

@@ -33,6 +33,7 @@ SHOW_ON_ABOUT=0
33 33
 DATSERVER_DOMAIN_NAME=
34 34
 DATSERVER_CODE=
35 35
 DATSERVER_DAT_VERSION='13.10.0'
36
+DATSERVER_HYPERCORED_VERSION='1.4.1'
36 37
 DATSERVER_DIRECTORY=/etc/datserver
37 38
 
38 39
 datserver_variables=(MY_USERNAME)
@@ -158,14 +159,22 @@ function configure_interactive_datserver {
158 159
 
159 160
 function upgrade_datserver {
160 161
     CURR_DATSERVER_DAT_VERSION=$(get_completion_param "datserver version")
161
-    if [[ "$CURR_DATSERVER_DAT_VERSION" == "$DATSERVER_DAT_VERSION" ]]; then
162
-        return
162
+    if [[ "$CURR_DATSERVER_DAT_VERSION" != "$DATSERVER_DAT_VERSION" ]]; then
163
+
164
+        if npm update -g dat@$DATSERVER_DAT_VERSION; then
165
+            set_completion_param "datserver version" "$DATSERVER_DAT_VERSION"
166
+        fi
167
+        chown -R datserver:datserver "$DATSERVER_DIRECTORY"
163 168
     fi
164 169
 
165
-    if npm update -g dat@$DATSERVER_DAT_VERSION; then
166
-        set_completion_param "datserver version" "$DATSERVER_DAT_VERSION"
170
+    CURR_DATSERVER_HYPERCORED_VERSION=$(get_completion_param "datserver hypercored version")
171
+    if [[ "$CURR_DATSERVER_HYPERCORED_VERSION" != "$DATSERVER_HYPERCORED_VERSION" ]]; then
172
+
173
+        if npm update -g hypercored@$DATSERVER_HYPERCORED_VERSION; then
174
+            set_completion_param "datserver hypercored version" "$DATSERVER_HYPERCORED_VERSION"
175
+        fi
176
+        chown -R datserver:datserver "$DATSERVER_DIRECTORY"
167 177
     fi
168
-    chown -R datserver:datserver "$DATSERVER_DIRECTORY"
169 178
 }
170 179
 
171 180
 function backup_local_datserver {
@@ -243,6 +252,7 @@ function remove_datserver {
243 252
     fi
244 253
     userdel -r datserver
245 254
     npm uninstall -g dat
255
+    npm uninstall -g hypercored
246 256
 
247 257
     remove_nodejs datserver
248 258
 
@@ -270,7 +280,13 @@ function install_datserver {
270 280
         exit 156835
271 281
     fi
272 282
 
283
+    if ! npm install -g hypercored@$DATSERVER_HYPERCORED_VERSION; then
284
+        echo $'hypercored was not installed'
285
+        exit 4635439
286
+    fi
287
+
273 288
     set_completion_param "datserver version" "$DATSERVER_DAT_VERSION"
289
+    set_completion_param "datserver hypercored version" "$DATSERVER_HYPERCORED_VERSION"
274 290
 
275 291
     if [ -d $DATSERVER_DIRECTORY ]; then
276 292
         rm -rf $DATSERVER_DIRECTORY