소스 검색

No peertube stop script

Bob Mottram 7 년 전
부모
커밋
abd7011b70
1개의 변경된 파일1개의 추가작업 그리고 8개의 파일을 삭제
  1. 1
    8
      src/freedombone-app-peertube

+ 1
- 8
src/freedombone-app-peertube 파일 보기

@@ -829,7 +829,7 @@ function install_peertube {
829 829
     # Hacky stuff to fix runtime errors
830 830
     sed -i 's|const url_1 = require("url");|const url_1 = require("url").Url;|g' dist/server/helpers/core-utils.js
831 831
     sed -i 's|const urlObject = new url_1.URL(url);|const urlObject = new url_1(url);|g' dist/server/helpers/core-utils.js
832
-    sed -i 's|return urlObject.href.replace(/\/$/, '');|return urlObject.href;|g' dist/server/helpers/core-utils.js
832
+    sed -i 's|return urlObject.href.replace.*|return urlObject.href;|g' dist/server/helpers/core-utils.js
833 833
 
834 834
     PEERTUBE_ONION_HOSTNAME=$(add_onion_service peertube 80 ${PEERTUBE_ONION_PORT})
835 835
 
@@ -839,12 +839,6 @@ function install_peertube {
839 839
     echo 'npm start' >> $PEERTUBE_DIR/start
840 840
     chmod +x $PEERTUBE_DIR/start
841 841
 
842
-    echo '#!/bin/bash' > $PEERTUBE_DIR/stop
843
-    echo "cd $PEERTUBE_DIR" >> $PEERTUBE_DIR/stop
844
-    echo 'PATH=$(npm bin):$PATH' >> $PEERTUBE_DIR/stop
845
-    echo 'npm stop' >> $PEERTUBE_DIR/stop
846
-    chmod +x $PEERTUBE_DIR/stop
847
-
848 842
     echo '[Unit]' > /etc/systemd/system/peertube.service
849 843
     echo 'Description=PeerTube Decentralized video streaming platform' >> /etc/systemd/system/peertube.service
850 844
     echo 'After=syslog.target' >> /etc/systemd/system/peertube.service
@@ -855,7 +849,6 @@ function install_peertube {
855 849
     echo 'Group=peertube' >> /etc/systemd/system/peertube.service
856 850
     echo "WorkingDirectory=$PEERTUBE_DIR" >> /etc/systemd/system/peertube.service
857 851
     echo "ExecStart=$PEERTUBE_DIR/start" >> /etc/systemd/system/peertube.service
858
-    echo "ExecStop=$PEERTUBE_DIR/stop" >> /etc/systemd/system/peertube.service
859 852
     echo 'StandardOutput=syslog' >> /etc/systemd/system/peertube.service
860 853
     echo 'StandardError=syslog' >> /etc/systemd/system/peertube.service
861 854
     echo 'SyslogIdentifier=peertube' >> /etc/systemd/system/peertube.service