Merge branch 'filepath-differences'

2 files changed, 7 insertions, 1 deletions

diff --git a/PKGBUILD b/PKGBUILD
index a0101e6242a3..a0c174796071 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,7 +13,7 @@ depends=('python' 'python-pip' 'nginx')
 makedepends=('git' 'portaudio')
 optdepends=()
 install=anki-sync-server.install
-source=('git+https://github.com/ankicommunity/anki-sync-server.git'
+source=('git+https://github.com/ankicommunity/anki-sync-server.git#branch=main'
         'anki2.0.py'
         'anki2.1.28.py'
         'anki2.1.py'
diff --git a/anki-sync-server.install b/anki-sync-server.install
index 9b11905b34a9..9aa8873e3f4a 100644
--- a/anki-sync-server.install
+++ b/anki-sync-server.install
@@ -4,6 +4,9 @@ post_install() {
   chown -R anki-sync-server /opt/anki-sync-server
   chgrp -R anki-sync-server /opt/anki-sync-server
 
+  # fix protobuf needs older version (pending upstream change)
+  sudo -u anki-sync-server sed -i "s/\\(protobuf\\)==.*$/\\1<=3.20.1/" /opt/anki-sync-server/requirements.txt
+
   # install prerequisites as stated on the website
   echo "installing python packages as anki-sync-server user..."
   sudo -u anki-sync-server pip install -r /opt/anki-sync-server/requirements.txt --user --no-warn-script-location
@@ -17,6 +20,9 @@ post_install() {
   echo "==============================================="
   echo "Check the manpage for post-install instructions"
   echo "==============================================="
+
+  # ankisyncctl.py can't find ankisyncd module unless it's in the root directory (pending upstream change)
+  sudo -u anki-sync-server mv /opt/anki-sync-server/ankisyncd_cli/ankisyncctl.py /opt/anki-sync-server/.
 }
 
 post_remove(){