From f96599b8886775621e62f77276dc685ccebdac06 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Thu, 19 Oct 2023 20:43:28 -0700 Subject: [PATCH 1/5] fix(pacstall-gui-git): Change settings install location --- packages/pacstall-gui-git/pacstall-gui-git.pacscript | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/pacstall-gui-git/pacstall-gui-git.pacscript b/packages/pacstall-gui-git/pacstall-gui-git.pacscript index 1feeb3273b..e5b771db18 100644 --- a/packages/pacstall-gui-git/pacstall-gui-git.pacscript +++ b/packages/pacstall-gui-git/pacstall-gui-git.pacscript @@ -12,17 +12,18 @@ pkgver() { } prepare() { - sudo mkdir -p "${pkgdir}/usr/bin" "${pkgdir}/usr/lib/pacstall-gui" "${pkgdir}/usr/share/applications" + sudo mkdir -p "${pkgdir}/usr/bin" "${pkgdir}$HOME/.config/pacstall-gui" "${pkgdir}/usr/share/applications" } package() { sudo install -Dm755 pacstall-gui "${pkgdir}/usr/bin/pacstall-gui" - sudo mv -f ./settings.sh "${pkgdir}/usr/lib/pacstall-gui" + sudo mv -f ./settings.sh "${pkgdir}$HOME/.config/pacstall-gui" sudo install -Dm755 LICENSE "${pkgdir}/usr/share/licenses/pacstall-gui/LICENSE" sudo mv -f ./pacstall-gui.desktop "${pkgdir}/usr/share/applications" } post_install() { - sudo chmod -R a+w "${pkgdir}/usr/lib/pacstall-gui" + sudo chmod -R a+w "${pkgdir}$HOME/.config/pacstall-gui" sudo update-desktop-database -q + sudo gtk-update-icon-cache } From 09942556c40309228ec8270d180e46d05a9dbc0b Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 20 Oct 2023 07:27:31 -0700 Subject: [PATCH 2/5] fix: use $homedir instead of $HOME --- packages/pacstall-gui-git/pacstall-gui-git.pacscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/pacstall-gui-git/pacstall-gui-git.pacscript b/packages/pacstall-gui-git/pacstall-gui-git.pacscript index e5b771db18..30591cef11 100644 --- a/packages/pacstall-gui-git/pacstall-gui-git.pacscript +++ b/packages/pacstall-gui-git/pacstall-gui-git.pacscript @@ -12,18 +12,18 @@ pkgver() { } prepare() { - sudo mkdir -p "${pkgdir}/usr/bin" "${pkgdir}$HOME/.config/pacstall-gui" "${pkgdir}/usr/share/applications" + sudo mkdir -p "${pkgdir}/usr/bin" "${pkgdir}$homedir/.config/pacstall-gui" "${pkgdir}/usr/share/applications" } package() { sudo install -Dm755 pacstall-gui "${pkgdir}/usr/bin/pacstall-gui" - sudo mv -f ./settings.sh "${pkgdir}$HOME/.config/pacstall-gui" + sudo mv -f ./settings.sh "${pkgdir}$homedir/.config/pacstall-gui" sudo install -Dm755 LICENSE "${pkgdir}/usr/share/licenses/pacstall-gui/LICENSE" sudo mv -f ./pacstall-gui.desktop "${pkgdir}/usr/share/applications" } post_install() { - sudo chmod -R a+w "${pkgdir}$HOME/.config/pacstall-gui" + sudo chmod -R a+w "${pkgdir}$homedir/.config/pacstall-gui" sudo update-desktop-database -q sudo gtk-update-icon-cache } From 2bf44b044e7631da8f1e4001cae1c75546e53f6a Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 20 Oct 2023 18:18:17 -0700 Subject: [PATCH 3/5] chore: do not package configs in ${pkgdir} --- packages/pacstall-gui-git/pacstall-gui-git.pacscript | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/pacstall-gui-git/pacstall-gui-git.pacscript b/packages/pacstall-gui-git/pacstall-gui-git.pacscript index 30591cef11..13d470213e 100644 --- a/packages/pacstall-gui-git/pacstall-gui-git.pacscript +++ b/packages/pacstall-gui-git/pacstall-gui-git.pacscript @@ -12,18 +12,18 @@ pkgver() { } prepare() { - sudo mkdir -p "${pkgdir}/usr/bin" "${pkgdir}$homedir/.config/pacstall-gui" "${pkgdir}/usr/share/applications" + sudo mkdir -p "${pkgdir}/usr/bin" "$homedir/.config/pacstall-gui" "${pkgdir}/usr/share/applications" } package() { sudo install -Dm755 pacstall-gui "${pkgdir}/usr/bin/pacstall-gui" - sudo mv -f ./settings.sh "${pkgdir}$homedir/.config/pacstall-gui" + sudo mv -f ./settings.sh "$homedir/.config/pacstall-gui" sudo install -Dm755 LICENSE "${pkgdir}/usr/share/licenses/pacstall-gui/LICENSE" sudo mv -f ./pacstall-gui.desktop "${pkgdir}/usr/share/applications" } post_install() { - sudo chmod -R a+w "${pkgdir}$homedir/.config/pacstall-gui" + sudo chmod -R a+w "$homedir/.config/pacstall-gui" sudo update-desktop-database -q sudo gtk-update-icon-cache } From e893a6995db3a3a2c5bd0369d2a20afd4627716a Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 20 Oct 2023 19:43:35 -0700 Subject: [PATCH 4/5] chore: Install configuration in post_install() --- packages/pacstall-gui-git/pacstall-gui-git.pacscript | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/packages/pacstall-gui-git/pacstall-gui-git.pacscript b/packages/pacstall-gui-git/pacstall-gui-git.pacscript index 13d470213e..6e46643612 100644 --- a/packages/pacstall-gui-git/pacstall-gui-git.pacscript +++ b/packages/pacstall-gui-git/pacstall-gui-git.pacscript @@ -12,18 +12,19 @@ pkgver() { } prepare() { - sudo mkdir -p "${pkgdir}/usr/bin" "$homedir/.config/pacstall-gui" "${pkgdir}/usr/share/applications" + sudo mkdir -p "${pkgdir}/usr/bin" "${pkgdir}/usr/share/applications" } package() { sudo install -Dm755 pacstall-gui "${pkgdir}/usr/bin/pacstall-gui" - sudo mv -f ./settings.sh "$homedir/.config/pacstall-gui" sudo install -Dm755 LICENSE "${pkgdir}/usr/share/licenses/pacstall-gui/LICENSE" sudo mv -f ./pacstall-gui.desktop "${pkgdir}/usr/share/applications" } post_install() { - sudo chmod -R a+w "$homedir/.config/pacstall-gui" + mkdir -p "$homedir/.config/pacstall-gui" + mv -f ./settings.sh "$homedir/.config/pacstall-gui" + chmod -R a+w "$homedir/.config/pacstall-gui" sudo update-desktop-database -q sudo gtk-update-icon-cache } From 28aa7d6b720c2823027be35c28c7d45a72e01d14 Mon Sep 17 00:00:00 2001 From: cat-master21 <96554164+cat-master21@users.noreply.github.com> Date: Fri, 20 Oct 2023 19:49:31 -0700 Subject: [PATCH 5/5] chore: don't include config file --- packages/pacstall-gui-git/pacstall-gui-git.pacscript | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/pacstall-gui-git/pacstall-gui-git.pacscript b/packages/pacstall-gui-git/pacstall-gui-git.pacscript index 6e46643612..01724f5a0f 100644 --- a/packages/pacstall-gui-git/pacstall-gui-git.pacscript +++ b/packages/pacstall-gui-git/pacstall-gui-git.pacscript @@ -22,9 +22,6 @@ package() { } post_install() { - mkdir -p "$homedir/.config/pacstall-gui" - mv -f ./settings.sh "$homedir/.config/pacstall-gui" - chmod -R a+w "$homedir/.config/pacstall-gui" sudo update-desktop-database -q sudo gtk-update-icon-cache }