tarina

commit 5be4a6cd575a2218ecac6d6a771d8897e6e78231
parent de2da3569c8a634294ab7a50f366aac2ad209fa5
Author: rbckman <rob@tarina.org>
Date:   Tue, 20 Dec 2022 16:39:28 +0000

backup

Diffstat:
M
install.sh
 | 
15
++++++++++-----
M
tarina.py
 | 
2
+-

2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/install.sh b/install.sh
@@ -57,9 +57,9 @@ apt-get update
 apt-get upgrade -y
 if [ "$version" = "buster" ]
 then
-    apt-get -y install git python3-pip python-configparser ffmpeg mediainfo gpac omxplayer sox cpufrequtils apache2 libapache2-mod-wsgi-py3 libdbus-glib-1-dev dbus libdbus-1-dev usbmount python3-numpy python3-pil python3-smbus python3-shortuuid wiringpi
+    apt-get -y install git python3-pip python-configparser ffmpeg mediainfo gpac omxplayer sox cpufrequtils apache2 libapache2-mod-wsgi-py3 libdbus-glib-1-dev dbus libdbus-1-dev usbmount python3-numpy python3-pil python3-smbus python3-shortuuid wiringpi make gcc
 else
-    apt-get -y install git python3-pip python-configparser libav-tools mediainfo gpac omxplayer sox cpufrequtils apache2 libapache2-mod-wsgi-py3 libdbus-glib-1-dev dbus libdbus-1-dev usbmount python3-numpy python3-pil python3-smbus python3-shortuuid wiringpi
+    apt-get -y install git python3-pip python-configparser libav-tools mediainfo gpac omxplayer sox cpufrequtils apache2 libapache2-mod-wsgi-py3 libdbus-glib-1-dev dbus libdbus-1-dev usbmount python3-numpy python3-pil python3-smbus python3-shortuuid wiringpi make gcc
 fi
 echo "installing python-omxplayer-wrapper..."
 sudo pip3 install omxplayer-wrapper
@@ -258,9 +258,14 @@ To all the amazing FOSS people out there big big props and
 
 EOF
 apt-get -y install ntfs-3g exfat-fuse
-sed -i -e 's/MountFlags=slave/MountFlags=shared/g' /lib/systemd/system/systemd-udevd.service
-sed -i '/FS_MOUNTOPTIONS=/c\FS_MOUNTOPTIONS="-fstype=ntfs-3g,nls=utf8,umask=007,gid=46 -fstype=fuseblk,nls=utf8,umask=007,gid=46 -fstype=vfat,gid=1000,uid=1000,umask=007"' /etc/usbmount/usbmount.conf
-sed -i '/FILESYSTEMS=/c\FILESYSTEMS="vfat ext2 ext3 ext4 hfsplus ntfs fuseblk vfat"' /etc/usbmount/usbmount.conf
+#sed -i -e 's/MountFlags=slave/MountFlags=shared/g' /lib/systemd/system/systemd-udevd.service
+#sed -i '/FS_MOUNTOPTIONS=/c\FS_MOUNTOPTIONS="-fstype=ntfs-3g,nls=utf8,umask=007,gid=46 -fstype=fuseblk,nls=utf8,umask=007,gid=46 -fstype=vfat,gid=1000,uid=1000,umask=007"' /etc/usbmount/usbmount.conf
+#sed -i '/FILESYSTEMS=/c\FILESYSTEMS="vfat ext2 ext3 ext4 hfsplus ntfs fuseblk vfat"' /etc/usbmount/usbmount.conf
+
+cat <<'EOF' > /etc/usbmount/usbmount.conf
+FS_MOUNTOPTIONS="-fstype=ntfs-3g,nls=utf8,umask=007,gid=46 -fstype=fuseblk,nls=utf8,umask=007,gid=46 -fstype=vfat,gid=1000,uid=1000,umask=007"
+FILESYSTEMS="vfat ext2 ext3 ext4 hfsplus ntfs fuseblk vfat"
+EOF
 
 cat <<'EOF' > /etc/udev/rules.d/usbmount.rules
 KERNEL=="sd*", DRIVERS=="sbp2",         ACTION=="add",  PROGRAM="/bin/systemd-escape -p --template=usbmount@.service $env{DEVNAME}", ENV{SYSTEMD_WANTS}+="%c"
diff --git a/tarina.py b/tarina.py
@@ -3105,7 +3105,7 @@ def copytousb(filmfolder):
                 except:
                     writemessage('Found existing ' + filmname + ', copying new files... ')
                 try:
-                    run_command('rsync -avr -P ' + filmfolder + filmname + '/ ' + usbpath)
+                    run_command('rsync -avr -P ' + filmfolder + filmname + ' ' + usbpath)
                 except:
                     writemessage('couldnt copy film ' + filmname)
                     waitforanykey()