From 319bb1e0d2cf7e146a9fdb05582d54b8a7c7d5cc Mon Sep 17 00:00:00 2001 From: Samuobe Date: Mon, 15 Sep 2025 21:12:14 +0200 Subject: [PATCH 1/6] Added update in setting whit script and AUR. Added the dev version of the softwer --- PKGBUILD/PKGBUILD-dev | 49 ++++++++++++++++++ lpak/English.lpak | 5 ++ lpak/Italiano.lpak | 7 ++- main.py | 5 +- settings.py | 117 +++++++++++++++++++++++++++++++++++++++--- 5 files changed, 174 insertions(+), 9 deletions(-) create mode 100644 PKGBUILD/PKGBUILD-dev diff --git a/PKGBUILD/PKGBUILD-dev b/PKGBUILD/PKGBUILD-dev new file mode 100644 index 0000000..5c3c1f7 --- /dev/null +++ b/PKGBUILD/PKGBUILD-dev @@ -0,0 +1,49 @@ +# Maintainer: Samuobe samuobe@ik.me + +pkgname=arch-store-git +pkgver=2.0.1 +pkgrel=1 +pkgdesc="A graphical app for managing your programs with pacman, AUR, flatpak, and appimage" +arch=('any') +url="https://github.com/Samuobe/Arch-Store" +license=('GPL3') +depends=('python' 'python-pyqt6') +makedepends=('git' 'python-setuptools') +source=("git+$url.git#branch=dev") +md5sums=('SKIP') + +pkgver() { + cd Arch-Store + git describe --tags --always | sed 's/^v//;s/-/./g' +} + +package() { + # Copia tutto il progetto in /usr/share/arch-store + install -d "$pkgdir/usr/share/arch-store" + cp -r "$srcdir/Arch-Store/"* "$pkgdir/usr/share/arch-store/" + + # Crea la cartella dati globale con permessi corretti + install -dm1777 "$pkgdir/var/lib/arch-store" + + + # Crea un wrapper in /usr/bin + install -Dm755 /dev/stdin "$pkgdir/usr/bin/arch-store" < Date: Mon, 15 Sep 2025 21:12:55 +0200 Subject: [PATCH 2/6] Rename package from arch-store-git to arch-store-dev-git --- PKGBUILD/PKGBUILD-dev | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/PKGBUILD/PKGBUILD-dev b/PKGBUILD/PKGBUILD-dev index 5c3c1f7..ef1f0fa 100644 --- a/PKGBUILD/PKGBUILD-dev +++ b/PKGBUILD/PKGBUILD-dev @@ -1,6 +1,6 @@ # Maintainer: Samuobe samuobe@ik.me -pkgname=arch-store-git +pkgname=arch-store-dev-git pkgver=2.0.1 pkgrel=1 pkgdesc="A graphical app for managing your programs with pacman, AUR, flatpak, and appimage" From 4557b2ee115378aa6ae939af73aae64987050176 Mon Sep 17 00:00:00 2001 From: Samuobe Date: Mon, 15 Sep 2025 21:24:14 +0200 Subject: [PATCH 3/6] Add option to install Arch-Store DEV branch in installation script (hidden) --- install.sh | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 8cc07f9..e7697c9 100644 --- a/install.sh +++ b/install.sh @@ -5,7 +5,7 @@ echo "Welcome to the Arch-Store installation program!" echo "What do you want to do?" echo "1) Install/Update Arch-Store" echo "2) Uninstall Arch-Store" -read -p "Select an option [1/2]: " action +read -p "Select an option [1/2/5]: " action if [[ "$action" == "1" ]]; then mkdir arch-store-install @@ -43,6 +43,16 @@ elif [[ "$action" == "2" ]]; then sudo pacman -Rns arch-store sudo pacman -Rns arch-store-git echo "FINISHED!" +elif [[ "$actions" == "5" ]]; then + echo "Installing Arch-Store DEV branch..." + wget https://raw.githubusercontent.com/samuobe/Arch-Store/main/PKGBUILD/PKGBUILD-dev + mv PKGBUILD-dev PKGBUILD + makepkg -si + rm PKGBUILD + echo "FINISHED!" + + cd .. + rm -rf arch-store-install fi From 00a319a2b8d3330c8cd573b8ccba036faf6caf54 Mon Sep 17 00:00:00 2001 From: Samuobe Date: Mon, 15 Sep 2025 21:26:08 +0200 Subject: [PATCH 4/6] Added info about the version --- lpak/English.lpak | 2 ++ lpak/Italiano.lpak | 4 +++- settings.py | 13 +++++++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/lpak/English.lpak b/lpak/English.lpak index a72e837..3272373 100644 --- a/lpak/English.lpak +++ b/lpak/English.lpak @@ -140,3 +140,5 @@ Select a version|Select a version Do you want to install the stable version?|Do you want to install the stable version? Do you want to open GitHub?|Do you want to open GitHub? It appears that you installed ArchStore from the script. Would you like to open GitHub to rerun the script?|It appears that you installed ArchStore from the script. Would you like to open GitHub to rerun the script? +Script|Script +Installated with|Installed whit diff --git a/lpak/Italiano.lpak b/lpak/Italiano.lpak index f7f8885..f754b14 100644 --- a/lpak/Italiano.lpak +++ b/lpak/Italiano.lpak @@ -139,4 +139,6 @@ Update ArchStore|Aggiorna ArchStore Select a version|Seleziona una versione Do you want to install the stable version?|Vuoi installare la versione stabile? Do you want to open GitHub?|Vuoi aprire GitHub? -It appears that you installed ArchStore from the script. Would you like to open GitHub to rerun the script?|Sembra che tu abbia installato ArchStore dallo script, vuoi aprire GitHub per riscaricarlo? \ No newline at end of file +It appears that you installed ArchStore from the script. Would you like to open GitHub to rerun the script?|Sembra che tu abbia installato ArchStore dallo script, vuoi aprire GitHub per riscaricarlo? +Script|Script +Installated with|Installato con \ No newline at end of file diff --git a/settings.py b/settings.py index 41a8e5c..e8d4b58 100644 --- a/settings.py +++ b/settings.py @@ -39,6 +39,11 @@ def read_config_data(): def open_setting(language, working_dir, avaible_languages, version): global pacman_status, aur_status, flatpak_status, aur_method, new_language, app_image_dir load_config_data(working_dir, avaible_languages, language) + + if not os.path.isfile(working_dir+"/script"): + script_installation_status = False + else: + script_installation_status = True #Edit repo def confirm_changes(): global pacman_status, aur_status, flatpak_status, aur_method, new_language, app_image_dir, old_language @@ -111,7 +116,7 @@ def setting_change_appimagedir(button): return def update_arch_store(): - if not os.path.isfile(working_dir+"/script"): + if script_installation_status == False: def after_operations(): button_update_archStore.setText(lpak.get("updated", language)) @@ -280,7 +285,11 @@ def github_button(): project_link.pressed.connect(github_button) #Version version_label = pq.QLabel(lpak.get("version", language)) - version_label_var = pq.QLabel(version) + if script_installation_status == False: + archstore_installation_method = "AUR" + else: + archstore_installation_method = "Script" + version_label_var = pq.QLabel(f"{version} ({lpak.get("Installated with", language)} {lpak.get(archstore_installation_method, language)})") #LINE line_separazione = pq.QFrame() line_separazione.setFrameShape(pq.QFrame.Shape.HLine) From 5e3ec3e2a86e2b70962687c6d5ddba2d21aff091 Mon Sep 17 00:00:00 2001 From: Samuobe Date: Mon, 15 Sep 2025 21:39:50 +0200 Subject: [PATCH 5/6] Updated update arch store window, now it is more clear. Now laguage list is create automatically --- lpak/English.lpak | 2 ++ lpak/Italiano.lpak | 4 +++- main.py | 13 ++++++++++++- settings.py | 5 ++--- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/lpak/English.lpak b/lpak/English.lpak index 3272373..9155036 100644 --- a/lpak/English.lpak +++ b/lpak/English.lpak @@ -142,3 +142,5 @@ Do you want to open GitHub?|Do you want to open GitHub? It appears that you installed ArchStore from the script. Would you like to open GitHub to rerun the script?|It appears that you installed ArchStore from the script. Would you like to open GitHub to rerun the script? Script|Script Installated with|Installed whit +updated, please restart|Updated, please restart ArchStore +updated|Updated diff --git a/lpak/Italiano.lpak b/lpak/Italiano.lpak index f754b14..bd79181 100644 --- a/lpak/Italiano.lpak +++ b/lpak/Italiano.lpak @@ -141,4 +141,6 @@ Do you want to install the stable version?|Vuoi installare la versione stabile? Do you want to open GitHub?|Vuoi aprire GitHub? It appears that you installed ArchStore from the script. Would you like to open GitHub to rerun the script?|Sembra che tu abbia installato ArchStore dallo script, vuoi aprire GitHub per riscaricarlo? Script|Script -Installated with|Installato con \ No newline at end of file +Installated with|Installato con +updated, please restart|Aggiornato, riavvia l'applicazione +updated|Aggiornato \ No newline at end of file diff --git a/main.py b/main.py index 23fbc06..4e7b848 100644 --- a/main.py +++ b/main.py @@ -10,6 +10,7 @@ from PyQt6.QtGui import QIcon from PyQt6.QtCore import QProcess import sys +import glob #PY files import appimages as archstoreAppimages @@ -20,7 +21,6 @@ from manage_installed_method import show_window as show_installed_method #fast access variables -avaible_languages= ["Chinese Simplified", "Deutsch", "English", "Español", "Euskera", "Français", "Italiano", "Lietuvių", "Norsk", "Polski", "Română", "Türkçe"] arch_store_version = "dev_NEW-UPDATE_1.0.0" #Base variables @@ -52,6 +52,7 @@ working_dir="/var/lib/arch-store" os.chdir(base_dir) user_name = getpass.getuser() +avaible_languages_temp = glob.glob(f"{base_dir}/lpak/*.lpak") #add anything global to global scope before using it global, also put defaults setting_repo_pacman="enable" @@ -61,6 +62,16 @@ language="English" AppImagesDir=f"{working_dir}/AppImages" +##################### +###starting things### +##################### + +#Adjust languages name +avaible_languages = [] +for language in avaible_languages_temp: + avaible_languages.append(language.split("/")[-1].split(".")[0]) +avaible_languages.sort(key=str.lower) + #Config data def load_config_data(): diff --git a/settings.py b/settings.py index e8d4b58..ae28e9e 100644 --- a/settings.py +++ b/settings.py @@ -118,8 +118,7 @@ def setting_change_appimagedir(button): def update_arch_store(): if script_installation_status == False: def after_operations(): - button_update_archStore.setText(lpak.get("updated", language)) - + button_update_archStore.setText(lpak.get("updated", language)) def start_thread_operations(label, button): @@ -143,7 +142,7 @@ def on_finished(exitCode, exitStatus): install_status = False progress_bar.setRange(0, 1) button.setText(lpak.get("finished", language)) - label.setText(lpak.get("finished", language)) + label.setText(lpak.get("updated, please restart", language)) try: button.pressed.disconnect() except TypeError: From 89d9a1cbb51ddd08fe6e1d6eeb340712b50fbc34 Mon Sep 17 00:00:00 2001 From: Samuele Oberti Date: Mon, 15 Sep 2025 21:45:54 +0200 Subject: [PATCH 6/6] Change arch_store_version to beta_SETTINGS-UPDATE_1.0.0 --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index 4e7b848..ece033c 100644 --- a/main.py +++ b/main.py @@ -21,7 +21,7 @@ from manage_installed_method import show_window as show_installed_method #fast access variables -arch_store_version = "dev_NEW-UPDATE_1.0.0" +arch_store_version = "beta_SETTINGS-UPDATE_1.0.0" #Base variables install_pacman_packages=[]