Make sure the official FreshRSS Extensions are used on conflict

Author: MentalFS

freshrss-extensions/root/etc/cont-init.d/90-freshrss-extensions renamed to freshrss-extensions/root/etc/cont-init.d/69-freshrss-extensions

@@ -5,7 +5,8 @@ cd /config/www/freshrss/extensions
 
 if [ -d .git-extensions ]; then
   echo updating freshrss-extensions
-  git --git-dir=.git-extensions --work-tree=. pull origin master --quiet
+  git --git-dir=.git-extensions --work-tree=. fetch --all --quiet
+  git --git-dir=.git-extensions --work-tree=. reset hard origin/master --quiet
 else
   echo installing freshrss-extensions
   rm -rf .git-extensions
@@ -14,4 +15,6 @@ else
   git --git-dir=.git-extensions --work-tree=. sparse-checkout init
   git --git-dir=.git-extensions --work-tree=. sparse-checkout set --no-cone "/xExtension-*"
   git --git-dir=.git-extensions --work-tree=. pull origin master --quiet
+  git --git-dir=.git-extensions --work-tree=. fetch --all --quiet
+  git --git-dir=.git-extensions --work-tree=. reset hard origin/master --quiet
 fi

freshrss-redditimage/root/etc/cont-init.d/91-freshrss-redditimage renamed to freshrss-redditimage/root/etc/cont-init.d/66-freshrss-redditimage

@@ -6,7 +6,8 @@ cd /config/www/freshrss/extensions
 if [ -d xExtension-RedditImage/.git-redditimage ]; then
   echo updating freshrss-redditimage
   cd xExtension-RedditImage
-  git --git-dir=.git-redditimage --work-tree=. pull origin main --quiet
+  git --git-dir=.git-redditimage --work-tree=. fetch --all --quiet
+  git --git-dir=.git-redditimage --work-tree=. reset hard origin/main --quiet
 else
   echo installing freshrss-redditimage
   rm -rf xExtension-RedditImage

freshrss-redditsub/root/etc/cont-init.d/91-freshrss-redditsub renamed to freshrss-redditsub/root/etc/cont-init.d/66-freshrss-redditsub

@@ -6,7 +6,8 @@ cd /config/www/freshrss/extensions
 if [ -d xExtension-RedditSub/.git-redditsub ]; then
   echo updating freshrss-redditsub
   cd xExtension-RedditSub
-  git --git-dir=.git-redditsub --work-tree=. pull origin master --quiet
+  git --git-dir=.git-redditsub --work-tree=. fetch --all --quiet
+  git --git-dir=.git-redditsub --work-tree=. reset hard origin/master --quiet
 else
   echo installing freshrss-redditsub
   rm -rf xExtension-RedditSub