Procházet zdrojové kódy

Improve peertube upgrade

Bob Mottram před 7 roky
rodič
revize
2824837420
1 změnil soubory, kde provedl 33 přidání a 6 odebrání
  1. 33
    6
      src/freedombone-app-peertube

+ 33
- 6
src/freedombone-app-peertube Zobrazit soubor

@@ -434,8 +434,38 @@ function upgrade_peertube {
434 434
     function_check set_repo_commit
435 435
     set_repo_commit $PEERTUBE_DIR "peertube commit" "$PEERTUBE_COMMIT" $PEERTUBE_REPO
436 436
 
437
-    cd "$PEERTUBE_DIR/scripts" || exit 7824552627
438
-    sudo -u peertube ./upgrade.sh $PEERTUBE_DIR
437
+    if ! npm install -g yarn@1.5.1; then
438
+        echo $'Failed to install yarn'
439
+        exit 79353234
440
+    fi
441
+    yarn add -D webpack --network-concurrency 1
442
+    if ! yarn install; then
443
+        echo $'Failed to run yarn install'
444
+        exit 63754235
445
+    fi
446
+    if ! npm install -g npm@4; then
447
+        # https://github.com/KraigM/homebridge-harmonyhub/issues/119
448
+        echo $'Failed to downgrade npm'
449
+        npm install -g "npm@${NPM_VERSION}"
450
+        cp /root/.npm-global/bin/npm /usr/local/bin/npm
451
+        exit 3476835
452
+    fi
453
+    cp /root/.npm-global/bin/npm /usr/local/bin/npm
454
+    if ! npm install; then
455
+        echo $'Failed to install peertube'
456
+        npm install -g "npm@${NPM_VERSION}"
457
+        cp /root/.npm-global/bin/npm /usr/local/bin/npm
458
+        exit 7835243
459
+    fi
460
+    if ! npm install -g "npm@${NPM_VERSION}"; then
461
+        echo $'Failed to restore npm after downgrade'
462
+        exit 5737583
463
+    fi
464
+    cp /root/.npm-global/bin/npm /usr/local/bin/npm
465
+    npm run build
466
+
467
+    # This doesn't appear to work
468
+    #sudo -u peertube ./upgrade.sh $PEERTUBE_DIR
439 469
 
440 470
     chown -R peertube:peertube $PEERTUBE_DIR
441 471
     systemctl start peertube
@@ -1044,10 +1074,7 @@ function install_peertube {
1044 1074
         exit 5737583
1045 1075
     fi
1046 1076
     cp /root/.npm-global/bin/npm /usr/local/bin/npm
1047
-    if ! npm run build; then
1048
-        echo $'Failed to build peertube'
1049
-        exit 5293593
1050
-    fi
1077
+    npm run build
1051 1078
 
1052 1079
     PEERTUBE_ONION_HOSTNAME=$(add_onion_service peertube 80 ${PEERTUBE_ONION_PORT})
1053 1080