manager: fix packaging script

diff --git a/manager/scripts/make-package.sh b/manager/scripts/make-package.sh
index 1a7ffa6f526fdc4b7617b5b4b8e363dedf897b5b..3b56c1f8184e821d4eb8813e380ed171a1c66da6 100644 (file)
--- a/manager/scripts/make-package.sh
+++ b/manager/scripts/make-package.sh
@@ -17,7 +17,7 @@ function init_debian {
     apt-get update -qqq
 
     # apkg
-    apt-get install -y python3-pip meson git
+    apt-get install -y python3-pip meson git python3-venv
 }
 
 function init_fedora {
@@ -38,19 +38,18 @@ else
 fi
 
 # install apkg
-pip3 install apkg
+python3 -m pip install --user pipx
+python3 -m pipx ensurepath
+PATH="$PATH:/root/.local/bin"  # hack to make binaries installed with pipx work
+python3 -m pipx install apkg
 
 # prepare the repo
 git clone https://gitlab.nic.cz/knot/knot-resolver
 cd knot-resolver
-git config --global user.email "ci@knot-resolver"
-git config --global user.name "GitLab CI"
-git checkout manager-integration
+git config --global user.email "automated-script"
+git config --global user.name "Automated Script"
+git checkout manager-integration-without-submodule
 git submodule update --init --recursive
-cd manager
-git checkout master
-cd ..
-git commit -a -m "auto-update of knot-resolver's manager to the latest master branch"
 
 # build the package
 apkg system-setup