From ca4c3babd392bf2c6676811e69a8b4b2fe3cdf52 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Mon, 14 Feb 2022 12:01:05 -0300 Subject: [PATCH 1/6] [AppImageBuilder.yml] fix: wrong PATH variable --- linux_dist/appimage/AppImageBuilder.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/linux_dist/appimage/AppImageBuilder.yml b/linux_dist/appimage/AppImageBuilder.yml index 03181384..f58b14a4 100755 --- a/linux_dist/appimage/AppImageBuilder.yml +++ b/linux_dist/appimage/AppImageBuilder.yml @@ -65,7 +65,7 @@ AppDir: runtime: version: "continuous" env: - PATH: '${APPDIR}/usr/bin:${PATH}' + PATH: '${PATH}:${APPDIR}/usr/bin' PYTHONHOME: '${APPDIR}/usr' PYTHONPATH: '${APPDIR}/usr/lib/python3.8/site-packages' From 399470d699120eaaa4b1124259bee2bcb665e6de Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Mon, 14 Feb 2022 14:34:22 -0300 Subject: [PATCH 2/6] [AppImageBuilder.yml] improvement: removing unneeded PATH variable --- linux_dist/appimage/AppImageBuilder.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/linux_dist/appimage/AppImageBuilder.yml b/linux_dist/appimage/AppImageBuilder.yml index f58b14a4..fb7d8044 100755 --- a/linux_dist/appimage/AppImageBuilder.yml +++ b/linux_dist/appimage/AppImageBuilder.yml @@ -65,7 +65,6 @@ AppDir: runtime: version: "continuous" env: - PATH: '${PATH}:${APPDIR}/usr/bin' PYTHONHOME: '${APPDIR}/usr' PYTHONPATH: '${APPDIR}/usr/lib/python3.8/site-packages' From e4a444df4703d7ab016d74b873ed15b8cc61264e Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Mon, 14 Feb 2022 14:37:45 -0300 Subject: [PATCH 3/6] bumping version to 0.9.28 --- bauh/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bauh/__init__.py b/bauh/__init__.py index 6507afdc..dc5c9cbc 100644 --- a/bauh/__init__.py +++ b/bauh/__init__.py @@ -1,4 +1,4 @@ -__version__ = '0.9.27' +__version__ = '0.9.28' __app_name__ = 'bauh' import os From def2bd0c3ca461e439801685fe8f632142fa2ca7 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Mon, 14 Feb 2022 14:47:48 -0300 Subject: [PATCH 4/6] [view.qt.systray] fix: bauh-cli calls not referencing the containerized Python's interpreter [AppImage] --- CHANGELOG.md | 7 +++++++ bauh/view/qt/systray.py | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e86e19a6..389c328a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). +## [0.9.27] 2022-02-14 + +### Fixes +- Distribution + - AppImage: not able to detect updates on the **tray mode** because the `bauh-cli` call was referencing the system's Python interpreter instead of the containerized one. + + ## [0.9.27] 2022-02-11 ### Improvements diff --git a/bauh/view/qt/systray.py b/bauh/view/qt/systray.py index a3161d80..f7d40e01 100755 --- a/bauh/view/qt/systray.py +++ b/bauh/view/qt/systray.py @@ -30,7 +30,7 @@ def get_cli_path() -> str: if os.getenv('APPIMAGE'): - return CLI_NAME + return f"{os.environ['APPRUN_STARTUP_EXEC_PATH']} {os.environ['APPDIR']}usr/bin/{CLI_NAME}" venv = os.getenv('VIRTUAL_ENV') @@ -51,7 +51,7 @@ def get_cli_path() -> str: def list_updates(logger: logging.Logger) -> List[PackageUpdate]: cli_path = get_cli_path() if cli_path: - exitcode, output = system.execute(f'{cli_path} updates -f json', custom_env=dict(os.environ)) + exitcode, output = system.execute(f'{cli_path} updates -f json') if exitcode != 0: output_log = output.replace('\n', ' ') if output else ' ' From 265bb8073efef266feed17fa531298ce1c8638fe Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Mon, 14 Feb 2022 14:59:22 -0300 Subject: [PATCH 5/6] [CHANGELOG.md] Updating 0.9.28 changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 389c328a..139624b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,7 +8,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Fixes - Distribution - - AppImage: not able to detect updates on the **tray mode** because the `bauh-cli` call was referencing the system's Python interpreter instead of the containerized one. + - AppImage: not able to detect updates on the **tray mode** because the `bauh-cli` call was referencing the system's Python interpreter instead of the containerized one [#230](https://github.com/vinifmor/bauh/issues/230) ## [0.9.27] 2022-02-11 From edfa1f7c4c34b65e64bc8dc124ab1a68315766a8 Mon Sep 17 00:00:00 2001 From: Vinicius Moreira Date: Mon, 14 Feb 2022 15:06:55 -0300 Subject: [PATCH 6/6] [CHANGELOG.md] fix: release version --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 139624b6..9a4ded53 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). -## [0.9.27] 2022-02-14 +## [0.9.28] 2022-02-14 ### Fixes - Distribution