From ff6866d6867768ebfb103aa40f0b6348c916ef5a Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Sun, 1 Apr 2018 19:34:58 +0100
Subject: [PATCH] Use basename to avoid slashes
---
src/freedombone-app-peertube | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/freedombone-app-peertube b/src/freedombone-app-peertube
index 222ef4fee..5f0e29e1a 100755
--- a/src/freedombone-app-peertube
+++ b/src/freedombone-app-peertube
@@ -110,10 +110,10 @@ function peertube_import_from_syncthing {
echo " peertubetitle=\$(basename \"\$video_file\" | awk -F '.' '{print \$1}' | sed 's|_| |g' | sed 's|-| |g')";
echo " if $nodecmd \$import_script -n \$peertubetitle \$peertubensfw \$peertubeprivate -u \"\$peertubedomain\" -U \"\$peertubeuser\" --password \"\$peertubepassword\" -f \"\$video_file\"; then";
echo " echo \"\$video_file\" >> /root/.peertube_uploaded";
- echo " sed -i \"/\$video_file/d\" /root/.peertube_uploading";
+ echo " sed -i \"/\$(basename \$video_file)/d\" /root/.peertube_uploading";
echo " exit 0";
echo ' else';
- echo " sed -i \"/\$video_file/d\" /root/.peertube_uploading";
+ echo " sed -i \"/\$(basename \$video_file)/d\" /root/.peertube_uploading";
echo " failed_uploads=\$((failed_uploads+1))";
echo " if [ \$failed_uploads -gt 1 ]; then";
echo ' exit 0';
@@ -122,7 +122,7 @@ function peertube_import_from_syncthing {
echo ' fi';
echo ' else';
echo " if grep -q \"\$video_file\" /root/.peertube_uploading; then";
- echo " sed -i \"/\$video_file/d\" /root/.peertube_uploading";
+ echo " sed -i \"/\$(basename \$video_file)/d\" /root/.peertube_uploading";
echo ' fi';
echo ' fi';
echo ' fi';
--
GitLab