From 7456eb97a1514ad8a4441e65329aef756cd334b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Sol=C3=ADs?= <csolisr@azkware.net>
Date: Sun, 9 Feb 2025 02:29:19 +0000
Subject: [PATCH] fix: Correct permissions and frame amount counter

---
 friendica-fix-avatar-permissions.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/friendica-fix-avatar-permissions.sh b/friendica-fix-avatar-permissions.sh
index b7584e6..0a70c0f 100755
--- a/friendica-fix-avatar-permissions.sh
+++ b/friendica-fix-avatar-permissions.sh
@@ -5,7 +5,7 @@ IFS="
 site=friendica.example.net
 user=friendica
 group=www-data
-fileperm=640
+fileperm=660
 folderperm=770
 folder=/var/www/friendica
 folderescaped=${folder////\\/}
@@ -19,7 +19,7 @@ loop_1() {
 		nice -n 10 gifsicle --batch -O3 --lossy=80 --colors=255 "${p}" #&> /dev/null
 		#Specific compression for large GIF files
 		while [[ $(stat -c%s "${p}" || 0) -ge 512000 ]]; do
-			frameamount=$(exiftool -b -FrameCount "${p}" || 1)
+			frameamount=$(($(exiftool -b -FrameCount "${p}" || 1) - 1))
 			nice -n 10 gifsicle "${p}" $(seq -f "#%g" 0 2 "${frameamount}") -O3 --lossy=80 --colors=255 -o "${p}" #&> /dev/null
 		done
 	elif [[ "${p}" =~ .png ]]; then
@@ -43,7 +43,8 @@ loop_1() {
 
 cd "${folder}" || exit
 if [[ ! -f "${tmpfile}" ]]; then
-	sudo -u "${user}" bin/console movetoavatarcache | sudo tee "${tmpfile}" #&> /dev/null
+	#sudo -u "${user}" bin/console movetoavatarcache | sudo tee "${tmpfile}" #&> /dev/null
+	sudo bin/console movetoavatarcache | sudo tee "${tmpfile}" #&> /dev/null
 fi
 grep -e "https://${site}/${avatarfolder}/" "${tmpfile}" | sed -e "s/.*${site}/${folderescaped}/g" -e "s/?ts=.*//g" | (
 	while read -r i; do