From 93d10ab838cd1975927e7b3102ab3fa63c2d4515 Mon Sep 17 00:00:00 2001 From: Samuobe Date: Mon, 15 Sep 2025 21:47:54 +0200 Subject: [PATCH 1/4] Fix typo in action condition for installing Arch-Store DEV branch --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index e7697c9..70fd2b0 100644 --- a/install.sh +++ b/install.sh @@ -43,7 +43,7 @@ elif [[ "$action" == "2" ]]; then sudo pacman -Rns arch-store sudo pacman -Rns arch-store-git echo "FINISHED!" -elif [[ "$actions" == "5" ]]; then +elif [[ "$action" == "5" ]]; then echo "Installing Arch-Store DEV branch..." wget https://raw.githubusercontent.com/samuobe/Arch-Store/main/PKGBUILD/PKGBUILD-dev mv PKGBUILD-dev PKGBUILD From 7df712758ed5263b65bc04a072dcc3b3529f4c35 Mon Sep 17 00:00:00 2001 From: Samuobe Date: Mon, 15 Sep 2025 21:54:09 +0200 Subject: [PATCH 2/4] Update arch_store_version to dev_DEV-TEST_1.0.0 --- main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main.py b/main.py index ece033c..3589fee 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 = "beta_SETTINGS-UPDATE_1.0.0" +arch_store_version = "dev_DEV-TEST_1.0.0" #Base variables install_pacman_packages=[] From f6c27f5117d670c6e78fa9e7eda2579a10c1cf40 Mon Sep 17 00:00:00 2001 From: Samuobe Date: Mon, 15 Sep 2025 21:59:01 +0200 Subject: [PATCH 3/4] Fixed a bug that show always AUR installation --- settings.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/settings.py b/settings.py index ae28e9e..fc1a319 100644 --- a/settings.py +++ b/settings.py @@ -40,10 +40,10 @@ 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: + if os.path.isfile("/usr/share/arch-store/script"): script_installation_status = True + else: + script_installation_status = False #Edit repo def confirm_changes(): global pacman_status, aur_status, flatpak_status, aur_method, new_language, app_image_dir, old_language From f56e4bfd11bbaef06427034c7490a178ae21ca54 Mon Sep 17 00:00:00 2001 From: Samuobe Date: Mon, 15 Sep 2025 22:04:12 +0200 Subject: [PATCH 4/4] Upfated install.sh to prevent conflict beetween version --- install.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/install.sh b/install.sh index 70fd2b0..1520557 100644 --- a/install.sh +++ b/install.sh @@ -18,12 +18,16 @@ if [[ "$action" == "1" ]]; then if [[ "$choice" =~ ^[Yy]$ ]]; then echo "Installing Arch-Store stable..." + sudo pacman -Rns arch-store-git + sudo pacman -Rns arch-store-dev-git wget https://raw.githubusercontent.com/samuobe/Arch-Store/main/PKGBUILD/PKGBUILD makepkg -si rm PKGBUILD echo "FINISHED!" else - echo "Installing Arch-Store from main branch..." + echo "Installing Arch-Store from main branch (beta)..." + sudo pacman -Rns arch-store-dev-git + sudo pacman -Rns arch-store wget https://raw.githubusercontent.com/samuobe/Arch-Store/main/PKGBUILD/PKGBUILD-git mv PKGBUILD-git PKGBUILD makepkg -si @@ -42,15 +46,24 @@ elif [[ "$action" == "2" ]]; then echo "Uninstalling Arch-Store..." sudo pacman -Rns arch-store sudo pacman -Rns arch-store-git + sudo pacman -Rns arch-store-dev-git echo "FINISHED!" elif [[ "$action" == "5" ]]; then + mkdir arch-store-install + cd arch-store-install + PYTHON_PATH=$(which python3) + echo "Installing Arch-Store DEV branch..." + sudo pacman -Rns arch-store + sudo pacman -Rns arch-store-git wget https://raw.githubusercontent.com/samuobe/Arch-Store/main/PKGBUILD/PKGBUILD-dev mv PKGBUILD-dev PKGBUILD makepkg -si rm PKGBUILD + sudo touch /usr/share/arch-store/script echo "FINISHED!" + cd .. rm -rf arch-store-install fi