diff --git a/CHANGELOG.md b/CHANGELOG.md index 04425803..96b2a3ad 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). - autostart: `/etc/xdg/autostart` (only used by the Web gem at the moment) - desktop entries: `/usr/share/applications` - custom themes: `/usr/share/bauh/themes` + - symlinks/binaries : `/usr/local/bin` - UI - settings panel: diff --git a/README.md b/README.md index 4956e408..0a868062 100644 --- a/README.md +++ b/README.md @@ -193,7 +193,7 @@ bauh is officially distributed through [PyPi](https://pypi.org/project/bauh) and - Installed applications are store at `~/.local/share/bauh/appimage/installed` - Desktop entries (menu shortcuts) of the installed applications are stored at **~/.local/share/applications** (or `/usr/share/applications` for **root**). Name pattern: `bauh_appimage_appname.desktop` -- Symlinks are created at **~/.local/bin**. They have the same name of the application (if the name already exists, it will be created as 'app_name-appimage'. e.g: `rpcs3-appimage`) +- Symlinks are created at `~/.local/bin` (or `/usr/local/bin` for **root**). They have the same name of the application (if the name already exists, it will be created as 'app_name-appimage'. e.g: `rpcs3-appimage`) - Downloaded database files are stored at **~/.cache/bauh/appimage** as **apps.db** and **releases.db** - Databases are updated during the initialization process if they are considered outdated - Applications with ignored updates are defined at **~/.config/bauh/appimage/updates_ignored.txt** diff --git a/bauh/api/paths.py b/bauh/api/paths.py index 98a33be4..1e7b511b 100644 --- a/bauh/api/paths.py +++ b/bauh/api/paths.py @@ -11,3 +11,4 @@ DESKTOP_ENTRIES_DIR = '/usr/share/applications' if user.is_root() else f'{Path.h TEMP_DIR = f'/tmp/{__app_name__}@{getuser()}' LOGS_DIR = f'{TEMP_DIR}/logs' AUTOSTART_DIR = f'/etc/xdg/autostart' if user.is_root() else f'{Path.home()}/.config/autostart' +BINARIES_DIR = f'/usr/local/bin' if user.is_root() else f'{Path.home()}/.local/bin' diff --git a/bauh/gems/appimage/__init__.py b/bauh/gems/appimage/__init__.py index b17f6cd3..db513d1f 100644 --- a/bauh/gems/appimage/__init__.py +++ b/bauh/gems/appimage/__init__.py @@ -3,7 +3,7 @@ from pathlib import Path from typing import Optional from bauh import __app_name__ -from bauh.api.paths import CONFIG_DIR, TEMP_DIR, CACHE_DIR +from bauh.api.paths import CONFIG_DIR, TEMP_DIR, CACHE_DIR, BINARIES_DIR from bauh.commons import resource ROOT_DIR = os.path.dirname(os.path.abspath(__file__)) @@ -13,7 +13,7 @@ SUGGESTIONS_FILE = f'https://raw.githubusercontent.com/vinifmor/{__app_name__}-f CONFIG_FILE = f'{CONFIG_DIR}/appimage.yml' APPIMAGE_CONFIG_DIR = f'{CONFIG_DIR}/appimage' UPDATES_IGNORED_FILE = f'{APPIMAGE_CONFIG_DIR}/updates_ignored.txt' -SYMLINKS_DIR = f'{Path.home()}/.local/bin' +SYMLINKS_DIR = BINARIES_DIR URL_COMPRESSED_DATABASES = f'https://raw.githubusercontent.com/vinifmor/{__app_name__}-files/master/appimage/dbs.tar.gz' APPIMAGE_CACHE_DIR = f'{CACHE_DIR}/appimage' DATABASE_APPS_FILE = f'{APPIMAGE_CACHE_DIR}/apps.db'