Kaynağa Gözat

Use basename to avoid slashes

Bob Mottram 7 yıl önce
ebeveyn
işleme
ff6866d686
1 değiştirilmiş dosya ile 3 ekleme ve 3 silme
  1. 3
    3
      src/freedombone-app-peertube

+ 3
- 3
src/freedombone-app-peertube Dosyayı Görüntüle

@@ -110,10 +110,10 @@ function peertube_import_from_syncthing {
110 110
       echo "                peertubetitle=\$(basename \"\$video_file\" | awk -F '.' '{print \$1}' | sed 's|_| |g' | sed 's|-| |g')";
111 111
       echo "                if $nodecmd \$import_script -n \$peertubetitle \$peertubensfw \$peertubeprivate -u \"\$peertubedomain\" -U \"\$peertubeuser\" --password \"\$peertubepassword\" -f \"\$video_file\"; then";
112 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 114
       echo "                    exit 0";
115 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 117
       echo "                    failed_uploads=\$((failed_uploads+1))";
118 118
       echo "                    if [ \$failed_uploads -gt 1 ]; then";
119 119
       echo '                        exit 0';
@@ -122,7 +122,7 @@ function peertube_import_from_syncthing {
122 122
       echo '            fi';
123 123
       echo '        else';
124 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 126
       echo '            fi';
127 127
       echo '        fi';
128 128
       echo '    fi';