Bob Mottram 7 lat temu
rodzic
commit
455c987a9f
1 zmienionych plików z 10 dodań i 9 usunięć
  1. 10
    9
      src/freedombone-app-peertube

+ 10
- 9
src/freedombone-app-peertube Wyświetl plik

65
 
65
 
66
     { echo '#!/bin/bash';
66
     { echo '#!/bin/bash';
67
       echo '';
67
       echo '';
68
+      echo 'LOCKFILE=/root/.peertube.lock';
69
+      echo '';
68
       echo 'if [ -f /root/.peertube.lock ]; then';
70
       echo 'if [ -f /root/.peertube.lock ]; then';
69
-      echo "    lockctr=\$(cat /root/.peertube.lock)";
71
+      echo "    lockctr=\$(cat \$LOCKFILE)";
70
       echo "    lockctr=\$((lockctr+1))";
72
       echo "    lockctr=\$((lockctr+1))";
71
-      echo "    echo \"\$lockctr\" > /root/.peertube.lock";
73
+      echo "    echo \"\$lockctr\" > \$LOCKFILE";
72
       echo "    if [ \$lockctr -ge 30 ]; then";
74
       echo "    if [ \$lockctr -ge 30 ]; then";
73
-      echo "        rm /root/.peertube.lock";
75
+      echo "        rm \$LOCKFILE";
74
       echo '    else';
76
       echo '    else';
75
       echo '        exit 0';
77
       echo '        exit 0';
76
       echo '    fi';
78
       echo '    fi';
111
       echo '';
113
       echo '';
112
       echo 'failed_uploads=0';
114
       echo 'failed_uploads=0';
113
       echo '';
115
       echo '';
114
-      echo 'echo "0" > /root/.peertube.lock';
116
+      echo "cd ${PEERTUBE_DIR} || exit 32468356";
117
+      echo "echo \"0\" > \$LOCKFILE";
115
       echo '';
118
       echo '';
116
       echo "for video_file in \$search_dir/*; do";
119
       echo "for video_file in \$search_dir/*; do";
117
       echo "    if [[ \"\$video_file\" == *'.ogv' || \"\$video_file\" == *'.mp4' || \"\$video_file\" == *'.webm' ]]; then";
120
       echo "    if [[ \"\$video_file\" == *'.ogv' || \"\$video_file\" == *'.mp4' || \"\$video_file\" == *'.webm' ]]; then";
118
-      echo "        cd ${PEERTUBE_DIR} || exit 32468356";
119
-      echo "        ";
120
       echo "        if ! grep -q \"\$video_file\" /root/.peertube_uploaded; then";
121
       echo "        if ! grep -q \"\$video_file\" /root/.peertube_uploaded; then";
121
       echo "            peertubetitle=\$(basename \"\$video_file\" | awk -F '.' '{print \$1}' | sed 's|_| |g' | sed 's|-| |g')";
122
       echo "            peertubetitle=\$(basename \"\$video_file\" | awk -F '.' '{print \$1}' | sed 's|_| |g' | sed 's|-| |g')";
122
       echo "            if $nodecmd \$import_script -n \"\$peertubetitle\" \$peertubensfw \$peertubeprivate -u \"\$peertubedomain\" -U \"\$peertubeuser\" --password \"\$peertubepassword\" -f \"\$video_file\"; then";
123
       echo "            if $nodecmd \$import_script -n \"\$peertubetitle\" \$peertubensfw \$peertubeprivate -u \"\$peertubedomain\" -U \"\$peertubeuser\" --password \"\$peertubepassword\" -f \"\$video_file\"; then";
123
       echo "                echo \"\$video_file\" >> /root/.peertube_uploaded";
124
       echo "                echo \"\$video_file\" >> /root/.peertube_uploaded";
124
-      echo '                rm /root/.peertube.lock';
125
+      echo "                rm \$LOCKFILE";
125
       echo "                exit 0";
126
       echo "                exit 0";
126
       echo '            else';
127
       echo '            else';
127
       echo "                failed_uploads=\$((failed_uploads+1))";
128
       echo "                failed_uploads=\$((failed_uploads+1))";
128
       echo "                if [ \$failed_uploads -gt 1 ]; then";
129
       echo "                if [ \$failed_uploads -gt 1 ]; then";
129
-      echo '                    rm /root/.peertube.lock';
130
+      echo "                    rm \$LOCKFILE";
130
       echo '                    exit 0';
131
       echo '                    exit 0';
131
       echo '                fi';
132
       echo '                fi';
132
       echo '            fi';
133
       echo '            fi';
134
       echo '    fi';
135
       echo '    fi';
135
       echo 'done'; } > /usr/bin/peertubesync
136
       echo 'done'; } > /usr/bin/peertubesync
136
       echo '';
137
       echo '';
137
-      echo 'rm /root/.peertube.lock';
138
+      echo "rm \$LOCKFILE";
138
 
139
 
139
     chmod +x /usr/bin/peertubesync
140
     chmod +x /usr/bin/peertubesync
140
     cron_add_mins 1 /usr/bin/peertubesync
141
     cron_add_mins 1 /usr/bin/peertubesync