Browse Source

Use basename to avoid slashes

Bob Mottram 7 years ago
parent
commit
ff6866d686
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      src/freedombone-app-peertube

+ 3
- 3
src/freedombone-app-peertube View File

110
       echo "                peertubetitle=\$(basename \"\$video_file\" | awk -F '.' '{print \$1}' | sed 's|_| |g' | sed 's|-| |g')";
110
       echo "                peertubetitle=\$(basename \"\$video_file\" | awk -F '.' '{print \$1}' | sed 's|_| |g' | sed 's|-| |g')";
111
       echo "                if $nodecmd \$import_script -n \$peertubetitle \$peertubensfw \$peertubeprivate -u \"\$peertubedomain\" -U \"\$peertubeuser\" --password \"\$peertubepassword\" -f \"\$video_file\"; then";
111
       echo "                if $nodecmd \$import_script -n \$peertubetitle \$peertubensfw \$peertubeprivate -u \"\$peertubedomain\" -U \"\$peertubeuser\" --password \"\$peertubepassword\" -f \"\$video_file\"; then";
112
       echo "                    echo \"\$video_file\" >> /root/.peertube_uploaded";
112
       echo "                    echo \"\$video_file\" >> /root/.peertube_uploaded";
113
-      echo "                    sed -i \"/\$video_file/d\" /root/.peertube_uploading";
113
+      echo "                    sed -i \"/\$(basename \$video_file)/d\" /root/.peertube_uploading";
114
       echo "                    exit 0";
114
       echo "                    exit 0";
115
       echo '                else';
115
       echo '                else';
116
-      echo "                    sed -i \"/\$video_file/d\" /root/.peertube_uploading";
116
+      echo "                    sed -i \"/\$(basename \$video_file)/d\" /root/.peertube_uploading";
117
       echo "                    failed_uploads=\$((failed_uploads+1))";
117
       echo "                    failed_uploads=\$((failed_uploads+1))";
118
       echo "                    if [ \$failed_uploads -gt 1 ]; then";
118
       echo "                    if [ \$failed_uploads -gt 1 ]; then";
119
       echo '                        exit 0';
119
       echo '                        exit 0';
122
       echo '            fi';
122
       echo '            fi';
123
       echo '        else';
123
       echo '        else';
124
       echo "            if grep -q \"\$video_file\" /root/.peertube_uploading; then";
124
       echo "            if grep -q \"\$video_file\" /root/.peertube_uploading; then";
125
-      echo "                sed -i \"/\$video_file/d\" /root/.peertube_uploading";
125
+      echo "                sed -i \"/\$(basename \$video_file)/d\" /root/.peertube_uploading";
126
       echo '            fi';
126
       echo '            fi';
127
       echo '        fi';
127
       echo '        fi';
128
       echo '    fi';
128
       echo '    fi';