diff --git a/scripts/_common.sh b/scripts/_common.sh index 8d785a2..8296088 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -6,7 +6,7 @@ # dependencies used by the app # HACK zlib1g-dev libjpeg-dev (libwebp-dev optional but necessary for stickers) are necessary to compile / install pillow -pkg_dependencies="postgresql python3 zlib1g-dev libjpeg-dev libwebp-dev python3-venv libpq-dev" +pkg_dependencies="postgresql python3 zlib1g-dev libjpeg-dev libwebp-dev python3-venv libpq-dev libffi-dev" pkg_dependencies_e2be="libolm-dev" #================================================= diff --git a/scripts/install b/scripts/install index 081a00d..b9e9bd3 100755 --- a/scripts/install +++ b/scripts/install @@ -199,7 +199,7 @@ mkdir -p /var/log/$app # Configure Mautrix-Bridge python3 -m venv $final_path export HOME=$final_path # HACK see https://github.com/mautrix/telegram/issues/661 -$final_path/bin/pip3 install --upgrade setuptools wheel # HACK fixes "error: invalid command 'bdist_wheel'" +$final_path/bin/pip3 install --upgrade pip setuptools wheel $final_path/bin/pip3 install --upgrade $final_path/src/mautrix-telegram.tar.gz[postgres,speedups,qr_login] # metrics,hq_thumbnails,e2be if [ $encryption -eq 1 ]; then diff --git a/scripts/upgrade b/scripts/upgrade index fc40a5d..138f53a 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -122,8 +122,9 @@ ynh_system_user_create --username=$mautrix_bridge_user if [ "$upgrade_type" == "UPGRADE_APP" ]; then ynh_script_progression --message="Upgrading python packages..." --weight=1 - export HOME=$final_path # HACK see https://github.com/mautrix/telegram/issues/661 - $final_path/bin/pip3 install --upgrade setuptools wheel # HACK fixes "error: invalid command 'bdist_wheel'" + python3 -m venv $final_path + export HOME=$final_path + $final_path/bin/pip3 install --upgrade pip setuptools wheel $final_path/bin/pip3 install --upgrade $final_path/src/mautrix-telegram.tar.gz[postgres,speedups,qr_login] #,hq_thumbnails if [ $encryption -eq 1 ]; then