From c8422db706de7a2d3a6ddc490b50df2c030b6e3f Mon Sep 17 00:00:00 2001
From: oklopfer <104327997+oklopfer@users.noreply.github.com>
Date: Tue, 19 Nov 2024 17:23:39 -0500
Subject: [PATCH] ref(*): drop `_archive` usage on all git packages (#6685)

`_archive` will always just be repo name

---------

Co-authored-by: ook37 <oren+12345@taumoda.com>
---
 .../adapta-gtk-theme-git/adapta-gtk-theme-git.pacscript     | 6 +++---
 packages/apx-git/apx-git.pacscript                          | 6 +++---
 packages/ardour-git/ardour-git.pacscript                    | 6 +++---
 packages/awesome-git/awesome-git.pacscript                  | 4 ++--
 packages/bemenu-git/bemenu-git.pacscript                    | 4 ++--
 .../bes2600-firmware-git/bes2600-firmware-git.pacscript     | 4 ++--
 packages/bpytop-git/bpytop-git.pacscript                    | 4 ++--
 .../cachyos-ananicy-rules-git.pacscript                     | 2 +-
 .../conky-manager-zcot-git/conky-manager-zcot-git.pacscript | 4 ++--
 .../cutefish-calculator-git.pacscript                       | 6 +++---
 packages/cutefish-core-git/cutefish-core-git.pacscript      | 6 +++---
 packages/cutefish-dock-git/cutefish-dock-git.pacscript      | 6 +++---
 .../cutefish-filemanager-git.pacscript                      | 6 +++---
 packages/cutefish-icons-git/cutefish-icons-git.pacscript    | 6 +++---
 .../cutefish-kwin-plugins-git.pacscript                     | 6 +++---
 .../cutefish-launcher-git/cutefish-launcher-git.pacscript   | 6 +++---
 .../cutefish-qt-plugins-git.pacscript                       | 6 +++---
 .../cutefish-settings-git/cutefish-settings-git.pacscript   | 6 +++---
 .../cutefish-statusbar-git/cutefish-statusbar-git.pacscript | 6 +++---
 .../cutefish-wallpapers-git.pacscript                       | 6 +++---
 packages/dino-git/dino-git.pacscript                        | 2 +-
 .../dmenu-distrotube-git/dmenu-distrotube-git.pacscript     | 4 ++--
 packages/doas-git/doas-git.pacscript                        | 4 ++--
 packages/easy-zsh-config-git/easy-zsh-config-git.pacscript  | 4 ++--
 packages/electrum-git/electrum-git.pacscript                | 4 ++--
 packages/emacs-git/emacs-git.pacscript                      | 6 +++---
 packages/endlessh-git/endlessh-git.pacscript                | 4 ++--
 packages/exa-git/exa-git.pacscript                          | 4 ++--
 packages/eza-git/eza-git.pacscript                          | 6 +++---
 packages/fastfetch-git/fastfetch-git.pacscript              | 4 ++--
 packages/fishui-git/fishui-git.pacscript                    | 6 +++---
 packages/fm6000-git/fm6000-git.pacscript                    | 4 ++--
 packages/fsearch-git/fsearch-git.pacscript                  | 6 +++---
 packages/fselect-git/fselect-git.pacscript                  | 4 ++--
 packages/git-extras-git/git-extras-git.pacscript            | 2 +-
 packages/glffetch-git/glffetch-git.pacscript                | 4 ++--
 .../gnome-shell-extension-installer-git.pacscript           | 2 +-
 packages/grapejuice-git/grapejuice-git.pacscript            | 2 +-
 packages/grive2-git/grive2-git.pacscript                    | 6 +++---
 packages/i3blocks-git/i3blocks-git.pacscript                | 6 +++---
 .../imwheel-exclude-patched-git.pacscript                   | 6 +++---
 packages/kalendar-git/kalendar-git.pacscript                | 4 ++--
 packages/latte-dock-git/latte-dock-git.pacscript            | 4 ++--
 packages/lemonbar-xft-git/lemonbar-xft-git.pacscript        | 4 ++--
 packages/libcamera-git/libcamera-git.pacscript              | 4 ++--
 packages/libcutefish-git/libcutefish-git.pacscript          | 6 +++---
 packages/libresprite-git/libresprite-git.pacscript          | 6 +++---
 packages/lightpad-git/lightpad-git.pacscript                | 4 ++--
 packages/lyrebird-git/lyrebird-git.pacscript                | 2 +-
 .../nautilus-open-in-blackbox-git.pacscript                 | 2 +-
 packages/notion-git/notion-git.pacscript                    | 4 ++--
 packages/obquit-git/obquit-git.pacscript                    | 2 +-
 .../obs-backgroundremoval-git.pacscript                     | 4 ++--
 packages/oh-my-posh-git/oh-my-posh-git.pacscript            | 4 ++--
 packages/opendoas-git/opendoas-git.pacscript                | 4 ++--
 packages/os-installer-git/os-installer-git.pacscript        | 4 ++--
 packages/pacget-git/pacget-git.pacscript                    | 2 +-
 packages/paconvert-git/paconvert-git.pacscript              | 4 ++--
 packages/pacstall-gui-git/pacstall-gui-git.pacscript        | 4 ++--
 packages/pacstall-qa-git/pacstall-qa-git.pacscript          | 4 ++--
 packages/pb-git/pb-git.pacscript                            | 2 +-
 packages/pdf-mix-tool-git/pdf-mix-tool-git.pacscript        | 6 +++---
 packages/pdfmm-git/pdfmm-git.pacscript                      | 2 +-
 packages/planner-git/planner-git.pacscript                  | 4 ++--
 packages/powertop-git/powertop-git.pacscript                | 6 +++---
 packages/prismlauncher-git/prismlauncher-git.pacscript      | 4 ++--
 packages/qtile-extras-git/qtile-extras-git.pacscript        | 4 ++--
 packages/qtile-git/qtile-git.pacscript                      | 2 +-
 .../quintom-cursor-theme-git.pacscript                      | 2 +-
 packages/reshade-shaders-git/reshade-shaders-git.pacscript  | 2 +-
 .../rhino-docker-builder-git.pacscript                      | 2 +-
 .../rhino-kvantum-theme-git.pacscript                       | 2 +-
 .../rhino-lightdm-theme-git.pacscript                       | 2 +-
 packages/rhino-neofetch-git/rhino-neofetch-git.pacscript    | 2 +-
 .../rhino-plymouth-theme-git.pacscript                      | 2 +-
 packages/rhino-setup-git/rhino-setup-git.pacscript          | 4 ++--
 packages/rhino-system-git/rhino-system-git.pacscript        | 4 ++--
 packages/slop-git/slop-git.pacscript                        | 4 ++--
 .../spacecadetpinball-git/spacecadetpinball-git.pacscript   | 6 +++---
 packages/spot-client-git/spot-client-git.pacscript          | 4 ++--
 packages/st-distrotube-git/st-distrotube-git.pacscript      | 4 ++--
 packages/st-lukesmith-git/st-lukesmith-git.pacscript        | 2 +-
 .../steamtinkerlaunch-git/steamtinkerlaunch-git.pacscript   | 2 +-
 packages/surf-distrotube-git/surf-distrotube-git.pacscript  | 4 ++--
 packages/suru-icon-theme-git/suru-icon-theme-git.pacscript  | 4 ++--
 packages/tdrop-git/tdrop-git.pacscript                      | 4 ++--
 packages/tenacity-git/tenacity-git.pacscript                | 6 +++---
 .../torbrowser-launcher-git.pacscript                       | 6 +++---
 packages/touchegg-git/touchegg-git.pacscript                | 4 ++--
 packages/tre-git/tre-git.pacscript                          | 4 ++--
 packages/tuner-git/tuner-git.pacscript                      | 6 +++---
 packages/unicorn-desktop-git/unicorn-desktop-git.pacscript  | 4 ++--
 packages/unicorn-mobile-git/unicorn-mobile-git.pacscript    | 4 ++--
 packages/universal-ctags-git/universal-ctags-git.pacscript  | 6 +++---
 .../vega-strike-engine-git/vega-strike-engine-git.pacscript | 4 ++--
 packages/vega-strike-git/vega-strike-git.pacscript          | 4 ++--
 packages/weechat-git/weechat-git.pacscript                  | 6 +++---
 packages/whatsie-git/whatsie-git.pacscript                  | 4 ++--
 .../xfce4-hotcorner-plugin-git.pacscript                    | 4 ++--
 .../xfce4-settings-pine-git.pacscript                       | 6 +++---
 packages/yafetch-git/yafetch-git.pacscript                  | 2 +-
 packages/youtube-dl-git/youtube-dl-git.pacscript            | 4 ++--
 .../zsh-history-substring-search-git.pacscript              | 2 +-
 103 files changed, 215 insertions(+), 215 deletions(-)

diff --git a/packages/adapta-gtk-theme-git/adapta-gtk-theme-git.pacscript b/packages/adapta-gtk-theme-git/adapta-gtk-theme-git.pacscript
index deb2766a15..ce4b295f64 100644
--- a/packages/adapta-gtk-theme-git/adapta-gtk-theme-git.pacscript
+++ b/packages/adapta-gtk-theme-git/adapta-gtk-theme-git.pacscript
@@ -9,16 +9,16 @@ pkgdesc="An adaptive Gtk+ theme based on Material Design Guidelines (Legacy)"
 maintainer=("Elsie19 <elsie19@pm.me>")
 
 prepare() {
-  cd "${_archive}"
+  cd "adapta-gtk-theme"
   ./autogen.sh --prefix=/usr --enable-parallel
 }
 
 build() {
-  cd "${_archive}"
+  cd "adapta-gtk-theme"
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "adapta-gtk-theme"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/apx-git/apx-git.pacscript b/packages/apx-git/apx-git.pacscript
index 6d6aae7224..e606c5200e 100644
--- a/packages/apx-git/apx-git.pacscript
+++ b/packages/apx-git/apx-git.pacscript
@@ -12,7 +12,7 @@ external_connection=true
 incompatible=('*:bullseye' '*:bookworm')
 
 prepare() {
-  cd "${_archive}"
+  cd "apx"
   sed -i "s;/usr/share/apx/distrobox/distrobox;/usr/bin/distrobox;" config/apx.json
   sed -i "/distrobox/d" Makefile
   sed -i "s|install: build|install:|" Makefile
@@ -20,12 +20,12 @@ prepare() {
 }
 
 build() {
-  cd "${_archive}"
+  cd "apx"
   export PATH=/usr/lib/go-1.22/bin:${PATH}
   make build
 }
 
 package() {
-  cd "${_archive}"
+  cd "apx"
   make install{,-manpages} DESTDIR="${pkgdir}"
 }
diff --git a/packages/ardour-git/ardour-git.pacscript b/packages/ardour-git/ardour-git.pacscript
index 7494ca6f62..2a4e37dd4e 100644
--- a/packages/ardour-git/ardour-git.pacscript
+++ b/packages/ardour-git/ardour-git.pacscript
@@ -16,7 +16,7 @@ pkgver="7.5"
 # patch="https://github.com/archlinux/svntogit-community/blob/packages/ardour/trunk/ardour-6.2-vendor_qm-dsp.patch"
 
 prepare() {
-  cd "${_archive}"
+  cd "ardour"
   # Patch uses vendored version of qm-dsp because qm-dsp >= 1.8.0 is not compatible
   # will be applied when ubuntu starts supporting qm-dsp 1.8.0
   # unsetting gtk2 rc (FS#54389)
@@ -24,7 +24,7 @@ prepare() {
 }
 
 build() {
-  cd "${_archive}"
+  cd "ardour"
   # export LINKFLAGS="$LDFLAGS"
   ./waf configure --prefix=/usr \
     --configdir=/etc \
@@ -41,7 +41,7 @@ build() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "ardour"
   ./waf i18n --destdir="${pkgdir}"
   ./waf install --destdir="${pkgdir}"
 
diff --git a/packages/awesome-git/awesome-git.pacscript b/packages/awesome-git/awesome-git.pacscript
index 2d862dd636..a8d55d7bcd 100644
--- a/packages/awesome-git/awesome-git.pacscript
+++ b/packages/awesome-git/awesome-git.pacscript
@@ -24,13 +24,13 @@ breaks=("${gives}" "${gives}-bin")
 replaces=("${gives}" "${gives}-bin")
 
 build() {
-  cd "${_archive}"
+  cd "awesome"
   # Build rquired files
   make -j"${NCPU}" DESTDIR="${pkgdir}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "awesome"
   # Install awesome
   make install DESTDIR="${pkgdir}"
   mkdir -p "${pkgdir}/usr/share/xsessions"
diff --git a/packages/bemenu-git/bemenu-git.pacscript b/packages/bemenu-git/bemenu-git.pacscript
index 4abc607b66..3efa925c24 100644
--- a/packages/bemenu-git/bemenu-git.pacscript
+++ b/packages/bemenu-git/bemenu-git.pacscript
@@ -16,13 +16,13 @@ makedepends=("scdoc" "wayland-protocols" "libcairo-dev" "libpango1.0-dev" "libxk
 breaks=("${gives}-bin" "${gives}")
 
 build() {
-  cd "${_archive}"
+  cd "bemenu"
   # Build nessesary files
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "bemenu"
   # Install license
   install -Dm644 "LICENSE-CLIENT" "LICENSE-LIB" -t "${pkgdir}/usr/share/licenses/${gives}"
 
diff --git a/packages/bes2600-firmware-git/bes2600-firmware-git.pacscript b/packages/bes2600-firmware-git/bes2600-firmware-git.pacscript
index 0e20f54011..21289e1958 100644
--- a/packages/bes2600-firmware-git/bes2600-firmware-git.pacscript
+++ b/packages/bes2600-firmware-git/bes2600-firmware-git.pacscript
@@ -8,7 +8,7 @@ source=("https://gitlab.com/pine64-org/bes2600-firmware.git")
 maintainer=("Oren Klopfer <oren@taumoda.com>")
 
 build() {
-  cd "${_archive}"
+  cd "bes2600-firmware"
   mkdir -p "${pkgdir}/usr/bin"
   mkdir -p "${pkgdir}/usr/lib/systemd/system"
 
@@ -48,7 +48,7 @@ ExecStart=bash -c 'if ! [[ -f /etc/modules-load.d/bes2600.conf ]]; then echo bes
 }
 
 package() {
-  cd "${_archive}"
+  cd "bes2600-firmware"
   mkdir -p "${pkgdir}/usr/lib/firmware"
   cp -r firmware/bes2600 "${pkgdir}/usr/lib/firmware"
 }
diff --git a/packages/bpytop-git/bpytop-git.pacscript b/packages/bpytop-git/bpytop-git.pacscript
index f04ffde8b1..fbfe502093 100644
--- a/packages/bpytop-git/bpytop-git.pacscript
+++ b/packages/bpytop-git/bpytop-git.pacscript
@@ -9,7 +9,7 @@ pkgdesc="Linux/OSX/FreeBSD resource monitor."
 external_connection="true"
 
 prepare() {
-  cd "${_archive}"
+  cd "bpytop"
   modern=("devel" "sid" "lunar" "bookworm" "mantic" "noble" "trixie" "testing" "unstable")
   for mod in "${modern[@]}"; do
     [[ ${mod} == "${DISTRO#*:}" ]] && pyhack=("--break-system-packages")
@@ -18,7 +18,7 @@ prepare() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "bpytop"
   make install DESTDIR="${pkgdir}"
   install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${gives}"
   install -Dm644 README.md -t "${pkgdir}/usr/share/doc/${gives}"
diff --git a/packages/cachyos-ananicy-rules-git/cachyos-ananicy-rules-git.pacscript b/packages/cachyos-ananicy-rules-git/cachyos-ananicy-rules-git.pacscript
index 84c8808964..c57fa1d6be 100644
--- a/packages/cachyos-ananicy-rules-git/cachyos-ananicy-rules-git.pacscript
+++ b/packages/cachyos-ananicy-rules-git/cachyos-ananicy-rules-git.pacscript
@@ -9,7 +9,7 @@ source=("https://github.com/CachyOS/ananicy-rules.git")
 maintainer=("vigress8 <vig@disroot.org>")
 
 package() {
-  cd "${_archive}"
+  cd "ananicy-rules"
   install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${gives}"
   rm -f README.md LICENSE
   install -d "${pkgdir}/etc/ananicy.d"
diff --git a/packages/conky-manager-zcot-git/conky-manager-zcot-git.pacscript b/packages/conky-manager-zcot-git/conky-manager-zcot-git.pacscript
index 629701e87f..ce8f8c4997 100644
--- a/packages/conky-manager-zcot-git/conky-manager-zcot-git.pacscript
+++ b/packages/conky-manager-zcot-git/conky-manager-zcot-git.pacscript
@@ -7,11 +7,11 @@ depends=("conky" "rsync")
 pkgdesc="Simple tool for managing Conky configs"
 
 build() {
-  cd "${_archive}"
+  cd "conky-manager2"
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "conky-manager2"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/cutefish-calculator-git/cutefish-calculator-git.pacscript b/packages/cutefish-calculator-git/cutefish-calculator-git.pacscript
index 31df39ce7e..04e695eb14 100644
--- a/packages/cutefish-calculator-git/cutefish-calculator-git.pacscript
+++ b/packages/cutefish-calculator-git/cutefish-calculator-git.pacscript
@@ -9,18 +9,18 @@ depends=("fishui" "libcutefish")
 pkgdesc="CutefishOS Calculator."
 
 prepare() {
-  cd "${_archive}"
+  cd "calculator"
   mkdir build
   cd build
 }
 
 build() {
-  cd "${_archive}"
+  cd "calculator"
   cmake ..
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "calculator"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/cutefish-core-git/cutefish-core-git.pacscript b/packages/cutefish-core-git/cutefish-core-git.pacscript
index 2fc424a803..fedd554ec1 100644
--- a/packages/cutefish-core-git/cutefish-core-git.pacscript
+++ b/packages/cutefish-core-git/cutefish-core-git.pacscript
@@ -9,18 +9,18 @@ depends=("fishui" "libpulse-dev" "libxtst6" "libpolkit-agent-1-dev" "libxcb-rand
 pkgdesc="System backend and start session and more."
 
 prepare() {
-  cd "${_archive}"
+  cd "core"
   mkdir build
   cd build
 }
 
 build() {
-  cd "${_archive}"
+  cd "core"
   cmake ..
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "core"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/cutefish-dock-git/cutefish-dock-git.pacscript b/packages/cutefish-dock-git/cutefish-dock-git.pacscript
index c5964c1327..16af2062cf 100644
--- a/packages/cutefish-dock-git/cutefish-dock-git.pacscript
+++ b/packages/cutefish-dock-git/cutefish-dock-git.pacscript
@@ -9,18 +9,18 @@ depends=("fishui" "libcutefish" "libqt5svg5-dev")
 pkgdesc="CutefishOS application dock."
 
 prepare() {
-  cd "${_archive}"
+  cd "dock"
   mkdir build
   cd build
 }
 
 build() {
-  cd "${_archive}"
+  cd "dock"
   cmake ..
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "dock"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/cutefish-filemanager-git/cutefish-filemanager-git.pacscript b/packages/cutefish-filemanager-git/cutefish-filemanager-git.pacscript
index aa590ed7d3..d875515a86 100644
--- a/packages/cutefish-filemanager-git/cutefish-filemanager-git.pacscript
+++ b/packages/cutefish-filemanager-git/cutefish-filemanager-git.pacscript
@@ -9,18 +9,18 @@ depends=("fishui" "libcutefish" "kio" "libkf5solid-dev")
 pkgdesc="Cutefish File Manager, simple to use, beautiful, and retain the classic PC interactive design."
 
 prepare() {
-  cd "${_archive}"
+  cd "filemanager"
   mkdir build
   cd build
 }
 
 build() {
-  cd "${_archive}"
+  cd "filemanager"
   cmake ..
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "filemanager"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/cutefish-icons-git/cutefish-icons-git.pacscript b/packages/cutefish-icons-git/cutefish-icons-git.pacscript
index 190dc91351..5c1ecb5364 100644
--- a/packages/cutefish-icons-git/cutefish-icons-git.pacscript
+++ b/packages/cutefish-icons-git/cutefish-icons-git.pacscript
@@ -8,18 +8,18 @@ makedepends=("extra-cmake-modules" "ninja-build")
 pkgdesc="System default icon theme of CutefishOS."
 
 prepare() {
-  cd "${_archive}"
+  cd "icons"
   mkdir build
 }
 
 build() {
-  cd "${_archive}"
+  cd "icons"
   cd build
   cmake ..
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "icons"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/cutefish-kwin-plugins-git/cutefish-kwin-plugins-git.pacscript b/packages/cutefish-kwin-plugins-git/cutefish-kwin-plugins-git.pacscript
index f93e3e638b..3cf6bcc800 100644
--- a/packages/cutefish-kwin-plugins-git/cutefish-kwin-plugins-git.pacscript
+++ b/packages/cutefish-kwin-plugins-git/cutefish-kwin-plugins-git.pacscript
@@ -9,19 +9,19 @@ depends=("libkf5config-dev" "libkdecorations2-dev" "libkf5guiaddons-dev" "libkf5
 pkgdesc="CutefishOS KWin Plugins."
 
 prepare() {
-  cd "${_archive}"
+  cd "kwin-plugins"
   mkdir build
 }
 
 build() {
-  cd "${_archive}"
+  cd "kwin-plugins"
   cd build
   cmake ..
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "kwin-plugins"
   cd build
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/cutefish-launcher-git/cutefish-launcher-git.pacscript b/packages/cutefish-launcher-git/cutefish-launcher-git.pacscript
index 3d5e5816dc..f4145d0677 100644
--- a/packages/cutefish-launcher-git/cutefish-launcher-git.pacscript
+++ b/packages/cutefish-launcher-git/cutefish-launcher-git.pacscript
@@ -9,18 +9,18 @@ depends=("fishui" "libcutefish" "libkf5windowsystem-dev")
 pkgdesc="CutefishOS's full-screen application launcher"
 
 prepare() {
-  cd "${_archive}"
+  cd "launcher"
   mkdir build
   cd build
 }
 
 build() {
-  cd "${_archive}"
+  cd "launcher"
   cmake ..
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "launcher"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/cutefish-qt-plugins-git/cutefish-qt-plugins-git.pacscript b/packages/cutefish-qt-plugins-git/cutefish-qt-plugins-git.pacscript
index 16a0fff455..539aeaa074 100644
--- a/packages/cutefish-qt-plugins-git/cutefish-qt-plugins-git.pacscript
+++ b/packages/cutefish-qt-plugins-git/cutefish-qt-plugins-git.pacscript
@@ -9,18 +9,18 @@ depends=("libkf5windowsystem-dev" "libdbusmenu-qt5-dev" "libqt5xdg-dev" "qtquick
 pkgdesc="Unify Qt application style of CutefishOS"
 
 prepare() {
-  cd "${_archive}"
+  cd "qt-plugins"
   mkdir build
   cd build
 }
 
 build() {
-  cd "${_archive}"
+  cd "qt-plugins"
   cmake ..
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "qt-plugins"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/cutefish-settings-git/cutefish-settings-git.pacscript b/packages/cutefish-settings-git/cutefish-settings-git.pacscript
index 330a02935e..9bdcffec2d 100644
--- a/packages/cutefish-settings-git/cutefish-settings-git.pacscript
+++ b/packages/cutefish-settings-git/cutefish-settings-git.pacscript
@@ -9,18 +9,18 @@ depends=("fishui" "libfontconfig1" "libfreetype-dev" "libicu-dev" "libkf5coreadd
 pkgdesc="System Settings application for Cutefish Desktop."
 
 prepare() {
-  cd "${_archive}"
+  cd "settings"
   mkdir build
   cd build
 }
 
 build() {
-  cd "${_archive}"
+  cd "settings"
   cmake ..
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "settings"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/cutefish-statusbar-git/cutefish-statusbar-git.pacscript b/packages/cutefish-statusbar-git/cutefish-statusbar-git.pacscript
index c2f849535d..cf97e28033 100644
--- a/packages/cutefish-statusbar-git/cutefish-statusbar-git.pacscript
+++ b/packages/cutefish-statusbar-git/cutefish-statusbar-git.pacscript
@@ -9,18 +9,18 @@ depends=("fishui" "libcutefish" "libdbusmenu-qt5-dev" "libqt5svg5-dev")
 pkgdesc="Top status bar of CutefishOS"
 
 prepare() {
-  cd "${_archive}"
+  cd "statusbar"
   mkdir build
   cd build
 }
 
 build() {
-  cd "${_archive}"
+  cd "statusbar"
   cmake ..
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "statusbar"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/cutefish-wallpapers-git/cutefish-wallpapers-git.pacscript b/packages/cutefish-wallpapers-git/cutefish-wallpapers-git.pacscript
index dd7325fc45..7815c69dfd 100644
--- a/packages/cutefish-wallpapers-git/cutefish-wallpapers-git.pacscript
+++ b/packages/cutefish-wallpapers-git/cutefish-wallpapers-git.pacscript
@@ -8,18 +8,18 @@ makedepends=("cmake" "ninja-build")
 pkgdesc="CutefishOS's system wallpaper."
 
 prepare() {
-  cd "${_archive}"
+  cd "wallpapers"
   mkdir build
   cd build
 }
 
 build() {
-  cd "${_archive}"
+  cd "wallpapers"
   cmake ..
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "wallpapers"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/dino-git/dino-git.pacscript b/packages/dino-git/dino-git.pacscript
index 516c2dffe0..c5e25cb860 100644
--- a/packages/dino-git/dino-git.pacscript
+++ b/packages/dino-git/dino-git.pacscript
@@ -8,7 +8,7 @@ pkgdesc="An extensible database system written in Bash"
 maintainer=("Elsie19 <elsie19@pm.me>")
 
 package() {
-  cd "${_archive}"
+  cd "Dino"
   install -Dm755 dino "${pkgdir}/usr/bin/dino"
   install -D programs/* -t "${pkgdir}/usr/share/dino/programs"
   install -Dm755 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/packages/dmenu-distrotube-git/dmenu-distrotube-git.pacscript b/packages/dmenu-distrotube-git/dmenu-distrotube-git.pacscript
index 8c5aecd61d..be9ba14b1e 100644
--- a/packages/dmenu-distrotube-git/dmenu-distrotube-git.pacscript
+++ b/packages/dmenu-distrotube-git/dmenu-distrotube-git.pacscript
@@ -9,11 +9,11 @@ pkgdesc="Distrotube's dmenu build"
 breaks=("dmenu" "dmenu_run" "dmenu_path")
 
 build() {
-  cd "${_archive}"
+  cd "dmenu-distrotube"
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "dmenu-distrotube"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/doas-git/doas-git.pacscript b/packages/doas-git/doas-git.pacscript
index 9c6886f14c..7d2d0fbd6b 100644
--- a/packages/doas-git/doas-git.pacscript
+++ b/packages/doas-git/doas-git.pacscript
@@ -25,12 +25,12 @@ sha512sums=(
 )
 
 build() {
-  cd "${_archive}"
+  cd "doas"
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "doas"
   # Install license
   install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${gives}/LICENSE"
 
diff --git a/packages/easy-zsh-config-git/easy-zsh-config-git.pacscript b/packages/easy-zsh-config-git/easy-zsh-config-git.pacscript
index c3e52aecd8..a58dbf3c40 100644
--- a/packages/easy-zsh-config-git/easy-zsh-config-git.pacscript
+++ b/packages/easy-zsh-config-git/easy-zsh-config-git.pacscript
@@ -11,13 +11,13 @@ pkgdesc="A simple but fast and out of the box configuration of zsh powered by oh
 maintainer=("Zahrun <Zahrun@github.com>")
 
 prepare() {
-  cd "${_archive}"
+  cd "easy-zsh-config"
   sed -i s:/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh:/usr/share/zsh-autosuggestions/zsh-autosuggestions.zsh:g easy-zsh-config
   sed -i s:/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh:/usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh:g easy-zsh-config
 }
 
 package() {
-  cd "${_archive}"
+  cd "easy-zsh-config"
   install -Dm644 zshrc "${pkgdir}/etc/zsh/zshrc-easy-zsh-config"
   install -Dm644 "LICENSE" -t "${pkgdir}/usr/share/licenses/${pkgname}/"
   install -Dm644 easy-zsh-config "${pkgdir}/usr/share/zsh/easy-zsh-config"
diff --git a/packages/electrum-git/electrum-git.pacscript b/packages/electrum-git/electrum-git.pacscript
index 94637b62b8..856213bec7 100644
--- a/packages/electrum-git/electrum-git.pacscript
+++ b/packages/electrum-git/electrum-git.pacscript
@@ -9,11 +9,11 @@ breaks=("${gives}-bin" "${gives}" "${gives}-app")
 pkgdesc="FOSS Bitcoin wallet written in Python - Git version"
 
 build() {
-  cd "${_archive}"
+  cd "electrum"
   python3 setup.py build
 }
 
 package() {
-  cd "${_archive}"
+  cd "electrum"
   python3 setup.py install --root="${pkgdir}" --optimize=1
 }
diff --git a/packages/emacs-git/emacs-git.pacscript b/packages/emacs-git/emacs-git.pacscript
index 306c40e3bf..c298fee1ba 100644
--- a/packages/emacs-git/emacs-git.pacscript
+++ b/packages/emacs-git/emacs-git.pacscript
@@ -173,7 +173,7 @@ if [[ ${DOCS_PDF} == "YES" && ! -d "/usr/local/texlive" ]]; then
 fi
 
 prepare() {
-  cd "${_archive}"
+  cd "emacs"
   [[ -x configure ]] || (./autogen.sh git && ./autogen.sh autoconf)
   if [[ ${CHECK} == "YES" ]]; then
     make -j"${NCPU}" check
@@ -181,7 +181,7 @@ prepare() {
 }
 
 build() {
-  cd "${_archive}"
+  cd "emacs"
   local _conf=(
     --prefix=/usr
     --sysconfdir=/etc
@@ -287,7 +287,7 @@ build() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "emacs"
   make -j"${NCPU}" DESTDIR="${pkgdir}" install
 
   # Install optional documentation formats
diff --git a/packages/endlessh-git/endlessh-git.pacscript b/packages/endlessh-git/endlessh-git.pacscript
index 916dd59739..7d8adc944d 100644
--- a/packages/endlessh-git/endlessh-git.pacscript
+++ b/packages/endlessh-git/endlessh-git.pacscript
@@ -15,12 +15,12 @@ pkgdesc="SSH tarpit that very slowly sends an endless, random SSH banner"
 maintainer=("Elsie19 <elsie19@pm.me>")
 
 build() {
-  cd "${_archive}"
+  cd "endlessh"
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "endlessh"
   make install DESTDIR="${pkgdir}"
   install -Dm644 README.md -t "${pkgdir}/usr/share/doc/${gives}"
   install -Dm644 UNLICENSE -t "${pkgdir}/usr/share/licenses/${gives}"
diff --git a/packages/exa-git/exa-git.pacscript b/packages/exa-git/exa-git.pacscript
index dddc8313ec..69820289f3 100644
--- a/packages/exa-git/exa-git.pacscript
+++ b/packages/exa-git/exa-git.pacscript
@@ -10,11 +10,11 @@ external_connection=true
 maintainer=("Elsie19 <elsie19@pm.me>")
 
 build() {
-  cd "${_archive}"
+  cd "exa"
   cargo build -j"${NCPU}" --release
 }
 
 package() {
-  cd "${_archive}"
+  cd "exa"
   install -Dm755 target/release/exa -t "${pkgdir}/usr/bin"
 }
diff --git a/packages/eza-git/eza-git.pacscript b/packages/eza-git/eza-git.pacscript
index a34aea5ee0..2621684aea 100644
--- a/packages/eza-git/eza-git.pacscript
+++ b/packages/eza-git/eza-git.pacscript
@@ -11,12 +11,12 @@ maintainer=("Elsie19 <elsie19@pm.me>")
 incompatible=('debian:bookworm')
 
 prepare() {
-  cd "${_archive}"
+  cd "eza"
   mkdir -p target/man1 target/man5
 }
 
 build() {
-  cd "${_archive}"
+  cd "eza"
   cargo build -j"${NCPU}" --release --locked
   pandoc --standalone -f markdown -t man "man/eza.1.md" > target/man1/eza.1
   pandoc --standalone -f markdown -t man "man/eza_colors.5.md" > target/man5/eza_colors.5
@@ -24,7 +24,7 @@ build() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "eza"
   # Install package
   install -Dm755 target/release/eza -t "${pkgdir}/usr/bin"
   # Install completions
diff --git a/packages/fastfetch-git/fastfetch-git.pacscript b/packages/fastfetch-git/fastfetch-git.pacscript
index e03bee56c7..6e6171c51d 100644
--- a/packages/fastfetch-git/fastfetch-git.pacscript
+++ b/packages/fastfetch-git/fastfetch-git.pacscript
@@ -29,7 +29,7 @@ optdepends=("libvulkan1: Vulkan module and GPU fallback"
 breaks=("${gives}" "${gives}-bin" "${gives}-deb" "${gives}-app")
 
 build() {
-  cd "${_archive}"
+  cd "fastfetch"
   # Build fastfetch
   mkdir -p build/
   (
@@ -40,7 +40,7 @@ build() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "fastfetch"
   # Install license
   install -Dm644 "LICENSE" -t "${pkgdir}/usr/share/licenses/${gives}"
 
diff --git a/packages/fishui-git/fishui-git.pacscript b/packages/fishui-git/fishui-git.pacscript
index 2997e88180..edb26f5e6c 100644
--- a/packages/fishui-git/fishui-git.pacscript
+++ b/packages/fishui-git/fishui-git.pacscript
@@ -9,18 +9,18 @@ depends=("libkf5windowsystem5" "libxcb-icccm4-dev" "qtquickcontrols2-5-dev" "qtb
 pkgdesc="FishUI is a GUI library based on QQC2 (Qt Quick Controls 2), every Cutefish application uses it."
 
 prepare() {
-  cd "${_archive}"
+  cd "fishui"
   mkdir build
   cd build || return 1
 }
 
 build() {
-  cd "${_archive}"
+  cd "fishui"
   cmake -DCMAKE_INSTALL_PREFIX:PATH=/usr ..
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "fishui"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/fm6000-git/fm6000-git.pacscript b/packages/fm6000-git/fm6000-git.pacscript
index af55c4b6d6..f405ff7fe8 100644
--- a/packages/fm6000-git/fm6000-git.pacscript
+++ b/packages/fm6000-git/fm6000-git.pacscript
@@ -9,12 +9,12 @@ pkgdesc="A simple fetch tool written in Perl"
 sha256sums=("d0127441a11db8d640a28753a8494a5155514e161415ca7b2c5ab3b33024517f")
 
 build() {
-  cd "${_archive}"
+  cd "fetch-master-6000"
   chmod +x fm6000.pl
 }
 
 package() {
-  cd "${_archive}"
+  cd "fetch-master-6000"
   mkdir -p "${pkgdir}/usr/bin/"
   cp fm6000.pl "${pkgdir}/usr/bin"
 }
diff --git a/packages/fsearch-git/fsearch-git.pacscript b/packages/fsearch-git/fsearch-git.pacscript
index 97b2237be1..2a3399c3fa 100644
--- a/packages/fsearch-git/fsearch-git.pacscript
+++ b/packages/fsearch-git/fsearch-git.pacscript
@@ -7,17 +7,17 @@ pkgver="0.2.2"
 makedepends=("git" "build-essential" "automake" "autopoint" "autoconf" "libtool" "pkg-config" "intltool" "autoconf-archive" "libicu-dev" "libpcre3-dev" "libglib2.0-dev" "libgtk-3-dev" "libxml2-utils")
 
 prepare() {
-  cd "${_archive}"
+  cd "fsearch"
   ./autogen.sh
 }
 
 build() {
-  cd "${_archive}"
+  cd "fsearch"
   ./configure
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "fsearch"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/fselect-git/fselect-git.pacscript b/packages/fselect-git/fselect-git.pacscript
index 0523574db5..90d7d6c548 100644
--- a/packages/fselect-git/fselect-git.pacscript
+++ b/packages/fselect-git/fselect-git.pacscript
@@ -10,11 +10,11 @@ external_connection=true
 incompatible=("debian:bullseye")
 
 build() {
-  cd "${_archive}"
+  cd "fselect"
   cargo build -j"${NCPU}" --release --locked
 }
 
 package() {
-  cd "${_archive}"
+  cd "fselect"
   install -Dm755 target/release/fselect -t "${pkgdir}/usr/bin"
 }
diff --git a/packages/git-extras-git/git-extras-git.pacscript b/packages/git-extras-git/git-extras-git.pacscript
index 2e9ab32713..00426667c3 100644
--- a/packages/git-extras-git/git-extras-git.pacscript
+++ b/packages/git-extras-git/git-extras-git.pacscript
@@ -10,6 +10,6 @@ depends=("git" "bsdmainutils")
 maintainer=("Elsie19 <elsie19@pm.me>")
 
 package() {
-  cd "${_archive}"
+  cd "git-extras"
   make DESTDIR="${pkgdir}" PREFIX=/usr SYSCONFDIR=/etc install
 }
diff --git a/packages/glffetch-git/glffetch-git.pacscript b/packages/glffetch-git/glffetch-git.pacscript
index af922bc629..78787c0d25 100644
--- a/packages/glffetch-git/glffetch-git.pacscript
+++ b/packages/glffetch-git/glffetch-git.pacscript
@@ -10,7 +10,7 @@ source=("https://github.com/Xdavius/GLFfetch.git")
 maintainer=("xdavius <xdavius@github.com>")
 
 prepare() {
-  cd "${_archive}"
+  cd "GLFfetch"
   chmod u+x scripts/*.sh
   echo "#!/bin/bash
   source /opt/GLFfetch/scripts/icon.sh
@@ -18,7 +18,7 @@ prepare() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "GLFfetch"
   install -Dm755 "glffetch" "${pkgdir}/usr/bin/glffetch"
   install -d "${pkgdir}/opt/GLFfetch/scripts"
   install -Dm655 "GLF.png" "${pkgdir}/opt/GLFfetch/GLF.png"
diff --git a/packages/gnome-shell-extension-installer-git/gnome-shell-extension-installer-git.pacscript b/packages/gnome-shell-extension-installer-git/gnome-shell-extension-installer-git.pacscript
index 052d15d6c3..f7cb91c0db 100644
--- a/packages/gnome-shell-extension-installer-git/gnome-shell-extension-installer-git.pacscript
+++ b/packages/gnome-shell-extension-installer-git/gnome-shell-extension-installer-git.pacscript
@@ -8,7 +8,7 @@ maintainer=("D-Brox <BroxZuka@protonmail.com>")
 depends=("curl" "perl" "dbus")
 
 package() {
-  cd "${_archive}"
+  cd "gnome-shell-extension-installer"
   install -Dm755 "${gives}" -t "${pkgdir}/usr/bin"
   install -Dm644 "LICENSE" -t "${pkgdir}/usr/share/licenses/${gives}"
   install -Dm644 "README.md" -t "${pkgdir}/usr/share/doc/${gives}"
diff --git a/packages/grapejuice-git/grapejuice-git.pacscript b/packages/grapejuice-git/grapejuice-git.pacscript
index 25690283a2..6e08406ba3 100644
--- a/packages/grapejuice-git/grapejuice-git.pacscript
+++ b/packages/grapejuice-git/grapejuice-git.pacscript
@@ -9,7 +9,7 @@ gives="grapejuice"
 breaks=("grapejuice" "grapejuice-bin" "grapejuice-app" "grapejuice-deb")
 
 package() {
-  cd "${_archive}"
+  cd "grapejuice"
   export PYTHONPATH="${PWD}/src"
   python3 -m grapejuice_packaging linux_package || python -m grapejuice_packaging linux_package
   cd dist/linux_package
diff --git a/packages/grive2-git/grive2-git.pacscript b/packages/grive2-git/grive2-git.pacscript
index 04ca28f207..239e1023ff 100644
--- a/packages/grive2-git/grive2-git.pacscript
+++ b/packages/grive2-git/grive2-git.pacscript
@@ -11,13 +11,13 @@ breaks=("${gives}" "${gives}-bin" "${gives}-deb" "${gives}-app")
 maintainer=("KwonNam Son <kwon37xi@gmail.com>")
 
 prepare() {
-  cd "${_archive}"
+  cd "grive2"
   mkdir build
   cd build || exit
 }
 
 build() {
-  cd "${_archive}"
+  cd "grive2"
   cmake -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     ..
@@ -25,7 +25,7 @@ build() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "grive2"
   make install DESTDIR="${pkgdir}"
 }
 # vim:set ft=sh ts=2 sw=2 et:
diff --git a/packages/i3blocks-git/i3blocks-git.pacscript b/packages/i3blocks-git/i3blocks-git.pacscript
index bca99f8020..92d3232799 100644
--- a/packages/i3blocks-git/i3blocks-git.pacscript
+++ b/packages/i3blocks-git/i3blocks-git.pacscript
@@ -9,17 +9,17 @@ breaks=("${gives}")
 maintainer=("Lanius <laniusone@pm.me>")
 
 prepare() {
-  cd "${_archive}"
+  cd "i3blocks"
   ./autogen.sh && ./configure
 }
 
 build() {
-  cd "${_archive}"
+  cd "i3blocks"
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "i3blocks"
   # Install i3blocks
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/imwheel-exclude-patched-git/imwheel-exclude-patched-git.pacscript b/packages/imwheel-exclude-patched-git/imwheel-exclude-patched-git.pacscript
index 3f2a6c6fe7..5d781ed704 100644
--- a/packages/imwheel-exclude-patched-git/imwheel-exclude-patched-git.pacscript
+++ b/packages/imwheel-exclude-patched-git/imwheel-exclude-patched-git.pacscript
@@ -7,17 +7,17 @@ breaks=("imwheel")
 pkgdesc="This project is a fork of imwheel's final official release containing only one change — a patch that repairs imwheel's broken @Exclude command"
 
 prepare() {
-  cd "${_archive}"
+  cd "imwheel-exclude-patched"
   ./configure --disable-gpm-doc
 }
 
 build() {
-  cd "${_archive}"
+  cd "imwheel-exclude-patched"
   make
 }
 
 package() {
-  cd "${_archive}"
+  cd "imwheel-exclude-patched"
   make install DESTDIR="${pkgdir}"
   cd "${pkgdir}/usr/local/"
   mkdir -p share
diff --git a/packages/kalendar-git/kalendar-git.pacscript b/packages/kalendar-git/kalendar-git.pacscript
index 85c1ae4fc1..afed46216d 100644
--- a/packages/kalendar-git/kalendar-git.pacscript
+++ b/packages/kalendar-git/kalendar-git.pacscript
@@ -11,14 +11,14 @@ maintainer=("Zahrun <Zahrun@github.com>")
 arch=('amd64')
 
 build() {
-  cd "${_archive}"
+  cd "kalendar"
   mkdir build && cd build || exit
   cmake .. -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" -GNinja
   ninja -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "kalendar"
   cd build || exit
   cmake --install .
   install -Dm644 "../LICENSES/"* -t "${pkgdir}/usr/share/licenses/${pkgname}/"
diff --git a/packages/latte-dock-git/latte-dock-git.pacscript b/packages/latte-dock-git/latte-dock-git.pacscript
index d8e28830ce..01127d82c3 100644
--- a/packages/latte-dock-git/latte-dock-git.pacscript
+++ b/packages/latte-dock-git/latte-dock-git.pacscript
@@ -20,7 +20,7 @@ breaks=("${gives}" "${gives}-bin")
 incompatible=("debian:bullseye")
 
 build() {
-  cd "${_archive}"
+  cd "latte-dock"
   # Build rquired files
   mkdir build && cd build
   cmake -DCMAKE_INSTALL_PREFIX=/usr \
@@ -28,7 +28,7 @@ build() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "latte-dock"
   # Install awesome
   cd build/
   make install DESTDIR="${pkgdir}"
diff --git a/packages/lemonbar-xft-git/lemonbar-xft-git.pacscript b/packages/lemonbar-xft-git/lemonbar-xft-git.pacscript
index a43d179ba8..97258529aa 100644
--- a/packages/lemonbar-xft-git/lemonbar-xft-git.pacscript
+++ b/packages/lemonbar-xft-git/lemonbar-xft-git.pacscript
@@ -8,11 +8,11 @@ pkgdesc="A lightweight xcb based bar with ported xft support."
 sha256sums=("c2ca60846e0cade326969dd3f1f10e723f1a94d90d0335132b844932e41effff")
 
 build() {
-  cd "${_archive}"
+  cd "lemonbar-xft"
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "lemonbar-xft"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/libcamera-git/libcamera-git.pacscript b/packages/libcamera-git/libcamera-git.pacscript
index 96047e2531..0df8cf6ba1 100644
--- a/packages/libcamera-git/libcamera-git.pacscript
+++ b/packages/libcamera-git/libcamera-git.pacscript
@@ -12,12 +12,12 @@ maintainer=("Oren Klopfer <oren@taumoda.com>")
 pkgdesc="Open source camera stack and framework"
 
 build() {
-  cd "${_archive}"
+  cd "libcamera"
   meson setup build
   ninja -C build -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "libcamera"
   DESTDIR="${pkgdir}" ninja -C build install
 }
diff --git a/packages/libcutefish-git/libcutefish-git.pacscript b/packages/libcutefish-git/libcutefish-git.pacscript
index f60dd44917..149a24d97e 100644
--- a/packages/libcutefish-git/libcutefish-git.pacscript
+++ b/packages/libcutefish-git/libcutefish-git.pacscript
@@ -9,18 +9,18 @@ depends=("kscreen" "modemmanager-qt-dev" "libkf5networkmanagerqt-dev" "libqt5qui
 pkgdesc="Cutefish System Library."
 
 prepare() {
-  cd "${_archive}"
+  cd "libcutefish"
   mkdir build
   cd build
 }
 
 build() {
-  cd "${_archive}"
+  cd "libcutefish"
   cmake ..
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "libcutefish"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/libresprite-git/libresprite-git.pacscript b/packages/libresprite-git/libresprite-git.pacscript
index 642b2d4284..30f5f4fadc 100644
--- a/packages/libresprite-git/libresprite-git.pacscript
+++ b/packages/libresprite-git/libresprite-git.pacscript
@@ -10,13 +10,13 @@ breaks=("aseprite" "libresprite-bin" "libresprite-app" "libresprite-deb" "libres
 gives="libresprite"
 
 prepare() {
-  cd "${_archive}"
+  cd "LibreSprite"
   git fetch --all --tags --prune
   git submodule update --init --recursive
   mkdir build
 }
 build() {
-  cd "${_archive}"
+  cd "LibreSprite"
   cd build
   cmake -G Ninja \
     -DWITH_DESKTOP_INTEGRATION=ON \
@@ -41,7 +41,7 @@ build() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "LibreSprite"
   cd build
   DESTDIR="${pkgdir}" ninja install
   # shellcheck disable=SC2103
diff --git a/packages/lightpad-git/lightpad-git.pacscript b/packages/lightpad-git/lightpad-git.pacscript
index dc87e51e01..5562369c95 100644
--- a/packages/lightpad-git/lightpad-git.pacscript
+++ b/packages/lightpad-git/lightpad-git.pacscript
@@ -9,12 +9,12 @@ pkgdesc="A lightweight, simple and powerful application launcher"
 maintainer=("Oren Klopfer <oren@taumoda.com>")
 
 prepare() {
-  cd "${_archive}"
+  cd "lightpad"
   meson build
 }
 
 package() {
-  cd "${_archive}"
+  cd "lightpad"
   DESTDIR="${pkgdir}" ninja -C build install
   mkdir -p "${pkgdir}/usr/bin"
   ln -sf "/usr/local/bin/com.github.libredeb.lightpad" "${pkgdir}/usr/bin/lightpad"
diff --git a/packages/lyrebird-git/lyrebird-git.pacscript b/packages/lyrebird-git/lyrebird-git.pacscript
index d52615857a..a32de7f10b 100644
--- a/packages/lyrebird-git/lyrebird-git.pacscript
+++ b/packages/lyrebird-git/lyrebird-git.pacscript
@@ -9,7 +9,7 @@ depends=("python3" "libgtk-3-dev" "python3-gi" "python3-gi-cairo" "gir1.2-gtk-3.
 makedepends=("python3-pip")
 
 package() {
-  cd "${_archive}"
+  cd "lyrebird"
   INSTALL_PREFIX="${pkgdir}/usr/local" ./install.sh
   sed -i "s|${pkgdir%/}||g" "${pkgdir}/usr/local/share/applications/lyrebird.desktop"
 }
diff --git a/packages/nautilus-open-in-blackbox-git/nautilus-open-in-blackbox-git.pacscript b/packages/nautilus-open-in-blackbox-git/nautilus-open-in-blackbox-git.pacscript
index b1f26cb649..a48e36ed09 100644
--- a/packages/nautilus-open-in-blackbox-git/nautilus-open-in-blackbox-git.pacscript
+++ b/packages/nautilus-open-in-blackbox-git/nautilus-open-in-blackbox-git.pacscript
@@ -8,7 +8,7 @@ maintainer=("Anifyuli <anifyuliansyah@gmail.com>")
 depends=("python3-nautilus")
 
 package() {
-  cd "${_archive}"
+  cd "nautilus-open-in-blackbox"
   install -Dm644 -t "${pkgdir}/usr/share/nautilus-python/extensions" nautilus-open-in-blackbox.py
 }
 
diff --git a/packages/notion-git/notion-git.pacscript b/packages/notion-git/notion-git.pacscript
index 1a671cfb77..7ba1e681f3 100644
--- a/packages/notion-git/notion-git.pacscript
+++ b/packages/notion-git/notion-git.pacscript
@@ -9,11 +9,11 @@ depends=("build-essential" "lua5.1" "liblua5.1-0-dev" "libx11-dev" "libxext-dev"
 breaks=("notion")
 
 build() {
-  cd "${_archive}"
+  cd "notion"
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "notion"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/obquit-git/obquit-git.pacscript b/packages/obquit-git/obquit-git.pacscript
index 0d73e0c5c5..c949d5f188 100644
--- a/packages/obquit-git/obquit-git.pacscript
+++ b/packages/obquit-git/obquit-git.pacscript
@@ -9,7 +9,7 @@ breaks=("${gives}" "${gives}-bin")
 maintainer=("Lanius <laniusone@pm.me>")
 
 package() {
-  cd "${_archive}"
+  cd "obquit"
   # Install obquit
   python3 setup.py install --root="${pkgdir}"
 }
diff --git a/packages/obs-backgroundremoval-git/obs-backgroundremoval-git.pacscript b/packages/obs-backgroundremoval-git/obs-backgroundremoval-git.pacscript
index 087ab9f5a5..2657db2997 100644
--- a/packages/obs-backgroundremoval-git/obs-backgroundremoval-git.pacscript
+++ b/packages/obs-backgroundremoval-git/obs-backgroundremoval-git.pacscript
@@ -11,13 +11,13 @@ maintainer=("Zahrun <Zahrun@github.com>")
 incompatible=('*:jammy' '*:focal' '*:bionic' '*:buster' '*:bullseye')
 
 build() {
-  cd "${_archive}"
+  cd "obs-backgroundremoval"
   cmake --preset linux-x86_64 -DCMAKE_INSTALL_PREFIX=/usr
   cmake --build build_x86_64 --parallel
 }
 
 package() {
-  cd "${_archive}"
+  cd "obs-backgroundremoval"
   cmake --install build_x86_64 --prefix "${pkgdir}"/usr
   install -Dm644 LICENSE -t "${pkgdir}/usr/share/licenses/${pkgname}"
 }
diff --git a/packages/oh-my-posh-git/oh-my-posh-git.pacscript b/packages/oh-my-posh-git/oh-my-posh-git.pacscript
index 23d7ab8560..ac889c4338 100644
--- a/packages/oh-my-posh-git/oh-my-posh-git.pacscript
+++ b/packages/oh-my-posh-git/oh-my-posh-git.pacscript
@@ -14,14 +14,14 @@ incompatible=('*:bookworm')
 external_connection=true
 
 build() {
-  cd "${_archive}"
+  cd "oh-my-posh"
   cd src || exit 1
   sed -i "s/go 1.22.3/go 1.22.2/g" go.mod
   /usr/lib/go-1.22/bin/go build -o "${gives}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "oh-my-posh"
   install -Dm644 COPYING -t "${pkgdir}/usr/share/licenses/${pkgname}"
   install -Dm755 "src/${gives}" -t "${pkgdir}/usr/bin/"
   install -d "${pkgdir}/usr/share/oh-my-posh/themes"
diff --git a/packages/opendoas-git/opendoas-git.pacscript b/packages/opendoas-git/opendoas-git.pacscript
index f0507039c6..bd9d9e7ba6 100644
--- a/packages/opendoas-git/opendoas-git.pacscript
+++ b/packages/opendoas-git/opendoas-git.pacscript
@@ -16,14 +16,14 @@ makedepends=("bison" "libpam0g-dev")
 breaks=("${gives}" "${gives}-bin")
 
 build() {
-  cd "${_archive}"
+  cd "OpenDoas"
   ./configure --prefix=/usr --with-timestamp
   # Build rquired files
   make -j"${NCPU}" DESTDIR="${pkgdir}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "OpenDoas"
   # Install license
   install -Dm644 "LICENSE" -t "${pkgdir}/usr/share/licenses/${gives}"
 
diff --git a/packages/os-installer-git/os-installer-git.pacscript b/packages/os-installer-git/os-installer-git.pacscript
index daf6bc9b6e..c28eed68a5 100644
--- a/packages/os-installer-git/os-installer-git.pacscript
+++ b/packages/os-installer-git/os-installer-git.pacscript
@@ -13,13 +13,13 @@ optdepends=("gnome-disk-utility: Default disk CMD if not set"
   "gnome-control-center: Default wifi CMD if not set")
 
 build() {
-  cd "${_archive}"
+  cd "os-installer"
   # Build nessesary files
   meson build --prefix="/usr" --buildtype=release
 }
 
 package() {
-  cd "${_archive}"
+  cd "os-installer"
   # Install license
   install -Dm644 "LICENSE" doc/* -t "${pkgdir}/usr/share/licenses/${gives}"
 
diff --git a/packages/pacget-git/pacget-git.pacscript b/packages/pacget-git/pacget-git.pacscript
index 4f0ce58450..38e982ccac 100644
--- a/packages/pacget-git/pacget-git.pacscript
+++ b/packages/pacget-git/pacget-git.pacscript
@@ -13,7 +13,7 @@ pkgdesc="A fully foss, lightweight fuzzysearching TUI frontend for pacstall usin
 ## installation steps
 #this just copies the files over and makes the file executable
 package() {
-  cd "${_archive}"
+  cd "pacget"
   install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${gives}/LICENSE"
   install -Dm755 "pacget" "${pkgdir}/usr/bin/pacget"
 }
diff --git a/packages/paconvert-git/paconvert-git.pacscript b/packages/paconvert-git/paconvert-git.pacscript
index 8ec8e89034..eb54a99209 100644
--- a/packages/paconvert-git/paconvert-git.pacscript
+++ b/packages/paconvert-git/paconvert-git.pacscript
@@ -8,11 +8,11 @@ pkgdesc="Paconvert makes converting PKGBUILDS into pacscripts easier."
 maintainer=("cat-master21 <96554164+cat-master21@users.noreply.github.com>")
 
 prepare() {
-  cd "${_archive}"
+  cd "paconvert"
   mkdir -p "${pkgdir}/usr/bin"
 }
 
 package() {
-  cd "${_archive}"
+  cd "paconvert"
   install -Dm755 ./paconvert "${pkgdir}/usr/bin/paconvert"
 }
diff --git a/packages/pacstall-gui-git/pacstall-gui-git.pacscript b/packages/pacstall-gui-git/pacstall-gui-git.pacscript
index 72d5035349..df7f99ad23 100644
--- a/packages/pacstall-gui-git/pacstall-gui-git.pacscript
+++ b/packages/pacstall-gui-git/pacstall-gui-git.pacscript
@@ -9,12 +9,12 @@ pkgdesc="A gui for Pacstall written in bash."
 maintainer=("cat-master21 <96554164+cat-master21@users.noreply.github.com>")
 
 prepare() {
-  cd "${_archive}"
+  cd "pacstall-gui"
   mkdir -p "${pkgdir}/usr/bin" "${pkgdir}/usr/share/applications"
 }
 
 package() {
-  cd "${_archive}"
+  cd "pacstall-gui"
   install -Dm755 pacstall-gui "${pkgdir}/usr/bin/pacstall-gui"
   install -Dm755 LICENSE "${pkgdir}/usr/share/licenses/pacstall-gui/LICENSE"
   mv -f ./pacstall-gui.desktop "${pkgdir}/usr/share/applications"
diff --git a/packages/pacstall-qa-git/pacstall-qa-git.pacscript b/packages/pacstall-qa-git/pacstall-qa-git.pacscript
index 5e76ca2d19..559db79bc0 100644
--- a/packages/pacstall-qa-git/pacstall-qa-git.pacscript
+++ b/packages/pacstall-qa-git/pacstall-qa-git.pacscript
@@ -9,12 +9,12 @@ pkgdesc="A tool to easily test pacscripts from PRs locally"
 maintainer=("Oren Klopfer <oren@taumoda.com>")
 
 build() {
-  cd "${_archive}"
+  cd "pacstall-qa"
   mkdir -p "${pkgdir}/usr/bin"
   mkdir -p "${pkgdir}/usr/share/pacstall-qa"
 }
 
 package() {
-  cd "${_archive}"
+  cd "pacstall-qa"
   DESTDIR="${pkgdir}" make install
 }
diff --git a/packages/pb-git/pb-git.pacscript b/packages/pb-git/pb-git.pacscript
index 740bf67f6b..fe8487e330 100644
--- a/packages/pb-git/pb-git.pacscript
+++ b/packages/pb-git/pb-git.pacscript
@@ -6,6 +6,6 @@ maintainer=("vigress8 <vig@disroot.org>")
 source=("https://git.envs.net/envs/pb.git")
 
 package() {
-  cd "${_archive}"
+  cd "pb"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/pdf-mix-tool-git/pdf-mix-tool-git.pacscript b/packages/pdf-mix-tool-git/pdf-mix-tool-git.pacscript
index 07cb0d4c72..70d41bf184 100644
--- a/packages/pdf-mix-tool-git/pdf-mix-tool-git.pacscript
+++ b/packages/pdf-mix-tool-git/pdf-mix-tool-git.pacscript
@@ -11,18 +11,18 @@ optdepends=("ImageMagick: image manipulation tool")
 maintainer=("echometerain <echometer@disroot.org>")
 
 prepare() {
-  cd "${_archive}"
+  cd "pdfmixtool"
   mkdir build
 }
 
 build() {
-  cd "${_archive}"
+  cd "pdfmixtool"
   cd build || return 1
   cmake .. -DCMAKE_INSTALL_PREFIX="/usr" -DCMAKE_BUILD_TYPE=Release
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "pdfmixtool"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/pdfmm-git/pdfmm-git.pacscript b/packages/pdfmm-git/pdfmm-git.pacscript
index 620d74d596..8f0eae2ab6 100644
--- a/packages/pdfmm-git/pdfmm-git.pacscript
+++ b/packages/pdfmm-git/pdfmm-git.pacscript
@@ -9,6 +9,6 @@ breaks=("${gives}")
 sha256sums=("3a1d5046490cbeb1f3a3eae34d66ea0e714a19a01f15dc43cb1d31fbb58d7a51")
 
 package() {
-  cd "${_archive}"
+  cd "pdfmm"
   install -Dm755 "${gives}" -t "${pkgdir}/usr/bin"
 }
diff --git a/packages/planner-git/planner-git.pacscript b/packages/planner-git/planner-git.pacscript
index 2218460621..3801c415d2 100644
--- a/packages/planner-git/planner-git.pacscript
+++ b/packages/planner-git/planner-git.pacscript
@@ -8,14 +8,14 @@ pkgdesc="Task manager with Todoist support designed for GNU/Linux"
 maintainer=("echometer <guacamolek@yandex.com>")
 
 build() {
-  cd "${_archive}"
+  cd "planner"
   meson build --prefix="/usr"
   cd build
   ninja
 }
 
 package() {
-  cd "${_archive}"
+  cd "planner"
   cd build
   DESTDIR="${pkgdir}" ninja install
 }
diff --git a/packages/powertop-git/powertop-git.pacscript b/packages/powertop-git/powertop-git.pacscript
index 70f9265c5b..8a35d557f2 100644
--- a/packages/powertop-git/powertop-git.pacscript
+++ b/packages/powertop-git/powertop-git.pacscript
@@ -10,17 +10,17 @@ maintainer=("Elsie19 <elsie19@pm.me>")
 pkgdesc="Linux tool used to diagnose issues with power consumption and power management"
 
 prepare() {
-  cd "${_archive}"
+  cd "powertop"
   ./autogen.sh
   ./configure
 }
 
 build() {
-  cd "${_archive}"
+  cd "powertop"
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "powertop"
   make DESTDIR="${pkgdir}" install
 }
diff --git a/packages/prismlauncher-git/prismlauncher-git.pacscript b/packages/prismlauncher-git/prismlauncher-git.pacscript
index 1d2e51a5ce..e29805075b 100644
--- a/packages/prismlauncher-git/prismlauncher-git.pacscript
+++ b/packages/prismlauncher-git/prismlauncher-git.pacscript
@@ -12,7 +12,7 @@ pkgdesc="Custom launcher for Minecraft"
 maintainer=("Oren Klopfer <oren@taumoda.com>")
 
 build() {
-  cd "${_archive}"
+  cd "PrismLauncher"
   cmake -S . -B build -G Ninja \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX="/usr" \
@@ -22,6 +22,6 @@ build() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "PrismLauncher"
   DESTDIR="${pkgdir}" cmake --install build
 }
diff --git a/packages/qtile-extras-git/qtile-extras-git.pacscript b/packages/qtile-extras-git/qtile-extras-git.pacscript
index 76aa36e383..ac1273095e 100644
--- a/packages/qtile-extras-git/qtile-extras-git.pacscript
+++ b/packages/qtile-extras-git/qtile-extras-git.pacscript
@@ -10,7 +10,7 @@ makedepends=("python3-venv" "python3-pip")
 external_connection="true"
 
 build() {
-  cd "${_archive}"
+  cd "qtile-extras"
   modern=("devel" "sid" "lunar" "bookworm" "mantic" "noble" "oracular" "trixie" "testing" "unstable")
   for mod in "${modern[@]}"; do
     [[ ${mod} == "${DISTRO#*:}" ]] && pyhack=("--break-system-packages")
@@ -21,7 +21,7 @@ build() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "qtile-extras"
   modern=("devel" "sid" "lunar" "bookworm" "mantic" "noble" "oracular" "trixie" "testing" "unstable")
   for mod in "${modern[@]}"; do
     [[ ${mod} == "${DISTRO#*:}" ]] && pyhack=("--break-system-packages")
diff --git a/packages/qtile-git/qtile-git.pacscript b/packages/qtile-git/qtile-git.pacscript
index 4100fea925..a51c7bdb3c 100644
--- a/packages/qtile-git/qtile-git.pacscript
+++ b/packages/qtile-git/qtile-git.pacscript
@@ -10,7 +10,7 @@ maintainer=("Ruturajn <nanotiruturaj@gmail.com>")
 external_connection="true"
 
 package() {
-  cd "${_archive}"
+  cd "qtile"
   modern=("devel" "sid" "lunar" "bookworm" "mantic" "noble" "trixie" "testing" "unstable")
   for mod in "${modern[@]}"; do
     [[ ${mod} == "${DISTRO#*:}" ]] && pyhack=("--break-system-packages")
diff --git a/packages/quintom-cursor-theme-git/quintom-cursor-theme-git.pacscript b/packages/quintom-cursor-theme-git/quintom-cursor-theme-git.pacscript
index d0af1e0e5f..9547c07bd5 100644
--- a/packages/quintom-cursor-theme-git/quintom-cursor-theme-git.pacscript
+++ b/packages/quintom-cursor-theme-git/quintom-cursor-theme-git.pacscript
@@ -8,7 +8,7 @@ pkgdesc="A cursor theme designed to look decent"
 maintainer=("Elsie19 <elsie19@pm.me>")
 
 package() {
-  cd "${_archive}"
+  cd "quintom-cursor-theme"
   mkdir -p "${pkgdir}/usr/share/icons"
   cp -r 'Quintom_Ink Cursors/Quintom_Ink' "${pkgdir}/usr/share/icons"
   cp -r 'Quintom_Snow Cursors/Quintom_Snow' "${pkgdir}/usr/share/icons"
diff --git a/packages/reshade-shaders-git/reshade-shaders-git.pacscript b/packages/reshade-shaders-git/reshade-shaders-git.pacscript
index 0041cf807e..90453db3b9 100644
--- a/packages/reshade-shaders-git/reshade-shaders-git.pacscript
+++ b/packages/reshade-shaders-git/reshade-shaders-git.pacscript
@@ -15,7 +15,7 @@ pkgver="0.0.1"
 breaks=("${gives}" "${gives}-bin" "${gives}-deb" "${gives}-app")
 
 package() {
-  cd "${_archive}"
+  cd "reshade-shaders"
   install -dm 755 "${pkgdir}/opt/reshade/shaders"
   install -Dm 644 Shaders/*.* "${pkgdir}/opt/reshade/shaders/"
   install -dm 755 "${pkgdir}/opt/reshade/textures"
diff --git a/packages/rhino-docker-builder-git/rhino-docker-builder-git.pacscript b/packages/rhino-docker-builder-git/rhino-docker-builder-git.pacscript
index b3e3a2e7e6..0b39e38479 100644
--- a/packages/rhino-docker-builder-git/rhino-docker-builder-git.pacscript
+++ b/packages/rhino-docker-builder-git/rhino-docker-builder-git.pacscript
@@ -7,7 +7,7 @@ pkgdesc="A script to easily build, pull, and test Rhino Linux Docker images"
 maintainer=("Oren Klopfer <oren@taumoda.com>")
 
 package() {
-  cd "${_archive}"
+  cd "docker"
   mkdir -p "${pkgdir}/usr/local/bin"
   install -Dm0755 ./"${gives}" "${pkgdir}/usr/local/bin"
   ln -sf "/usr/local/bin/${gives}" "${pkgdir}/usr/local/bin/rdb"
diff --git a/packages/rhino-kvantum-theme-git/rhino-kvantum-theme-git.pacscript b/packages/rhino-kvantum-theme-git/rhino-kvantum-theme-git.pacscript
index 47467d26b5..52db899423 100644
--- a/packages/rhino-kvantum-theme-git/rhino-kvantum-theme-git.pacscript
+++ b/packages/rhino-kvantum-theme-git/rhino-kvantum-theme-git.pacscript
@@ -8,7 +8,7 @@ arch=("all")
 pkgver="0.0.1"
 
 package() {
-  cd "${_archive}"
+  cd "KvRhino"
   mkdir -p "${pkgdir}/etc/skel/.config/Kvantum"
   mv KvRhino{,Dark} "${pkgdir}/etc/skel/.config/Kvantum"
 }
diff --git a/packages/rhino-lightdm-theme-git/rhino-lightdm-theme-git.pacscript b/packages/rhino-lightdm-theme-git/rhino-lightdm-theme-git.pacscript
index 3bc8c66f57..4b017c86db 100644
--- a/packages/rhino-lightdm-theme-git/rhino-lightdm-theme-git.pacscript
+++ b/packages/rhino-lightdm-theme-git/rhino-lightdm-theme-git.pacscript
@@ -7,7 +7,7 @@ arch=("all")
 pkgver="0.0.1"
 
 package() {
-  cd "${_archive}"
+  cd "lightdm"
   install -Dm644 rhino-blur.png -t "${pkgdir}/usr/share/pixmaps/"
   install -Dm644 lightdm-gtk-greeter.conf -t "${pkgdir}/etc/lightdm/"
 }
diff --git a/packages/rhino-neofetch-git/rhino-neofetch-git.pacscript b/packages/rhino-neofetch-git/rhino-neofetch-git.pacscript
index 7d80ea2a48..25510e32e3 100644
--- a/packages/rhino-neofetch-git/rhino-neofetch-git.pacscript
+++ b/packages/rhino-neofetch-git/rhino-neofetch-git.pacscript
@@ -11,6 +11,6 @@ pkgdesc="neofetch branded for Rhino Linux"
 maintainer=("Oren Klopfer <oren@taumoda.com>")
 
 package() {
-  cd "${_archive}"
+  cd "neofetch"
   DESTDIR="${pkgdir}" make install
 }
diff --git a/packages/rhino-plymouth-theme-git/rhino-plymouth-theme-git.pacscript b/packages/rhino-plymouth-theme-git/rhino-plymouth-theme-git.pacscript
index 8b10edd2e9..3a70f2f2ae 100644
--- a/packages/rhino-plymouth-theme-git/rhino-plymouth-theme-git.pacscript
+++ b/packages/rhino-plymouth-theme-git/rhino-plymouth-theme-git.pacscript
@@ -7,6 +7,6 @@ arch=("all")
 pkgver="0.0.1"
 
 package() {
-  cd "${_archive}"
+  cd "plymouth"
   install -Dm644 ./* -t "${pkgdir}/usr/share/plymouth/themes/rhino-spinner/"
 }
diff --git a/packages/rhino-setup-git/rhino-setup-git.pacscript b/packages/rhino-setup-git/rhino-setup-git.pacscript
index ef38dde29b..d924597b2c 100644
--- a/packages/rhino-setup-git/rhino-setup-git.pacscript
+++ b/packages/rhino-setup-git/rhino-setup-git.pacscript
@@ -13,13 +13,13 @@ external_connection=true
 incompatible=("debian:*")
 
 build() {
-  cd "${_archive}"
+  cd "rhino-setup"
   meson build
   mkdir -p "${pkgdir}/etc/skel/.config/autostart"
 }
 
 package() {
-  cd "${_archive}"
+  cd "rhino-setup"
   DESTDIR="${pkgdir}" ninja -C build install
   ln -sf "/usr/local/share/applications/org.rhinolinux.RhinoSetup.desktop" "${pkgdir}/etc/skel/.config/autostart/rhino-setup.desktop"
 }
diff --git a/packages/rhino-system-git/rhino-system-git.pacscript b/packages/rhino-system-git/rhino-system-git.pacscript
index a374ad8e62..472d1ee8f2 100644
--- a/packages/rhino-system-git/rhino-system-git.pacscript
+++ b/packages/rhino-system-git/rhino-system-git.pacscript
@@ -11,12 +11,12 @@ maintainer=("Oren Klopfer <oren@taumoda.com>")
 incompatible=("ubuntu:20.04" "ubuntu:20.10" "ubuntu:21.04" "ubuntu:21.10" "ubuntu:22.04" "debian:*")
 
 build() {
-  cd "${_archive}"
+  cd "rhino-system"
   meson setup build
 }
 
 package() {
-  cd "${_archive}"
+  cd "rhino-system"
   DESTDIR="${pkgdir}" ninja -C build install
   chmod +x "${pkgdir}/usr/local/bin/rhinosystem"
 }
diff --git a/packages/slop-git/slop-git.pacscript b/packages/slop-git/slop-git.pacscript
index d4e04960aa..2377a7a48f 100644
--- a/packages/slop-git/slop-git.pacscript
+++ b/packages/slop-git/slop-git.pacscript
@@ -10,12 +10,12 @@ breaks=("${gives}-bin" "${gives}")
 maintainer=("Elsie19 <elsie19@pm.me>")
 
 build() {
-  cd "${_archive}"
+  cd "slop"
   cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="/usr" ./
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "slop"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/spacecadetpinball-git/spacecadetpinball-git.pacscript b/packages/spacecadetpinball-git/spacecadetpinball-git.pacscript
index 623eb81b59..79ed598a5c 100644
--- a/packages/spacecadetpinball-git/spacecadetpinball-git.pacscript
+++ b/packages/spacecadetpinball-git/spacecadetpinball-git.pacscript
@@ -27,12 +27,12 @@ makedepends=("libsdl2-dev" "libsdl2-mixer-dev" "unrar" "cmake")
 breaks=("${gives}" "${gives}-bin" "${gives}-app" "${gives}-deb")
 
 prepare() {
-  cd "${_archive}"
+  cd "spacecadetpinball"
   unrar e -y "${srcdir}"/Space_Cadet.rar Space_Cadet/
 }
 
 build() {
-  cd "${_archive}"
+  cd "spacecadetpinball"
   cmake -B "build" \
     -Wno-dev \
     -DCMAKE_BUILD_TYPE=Release \
@@ -42,7 +42,7 @@ build() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "spacecadetpinball"
   # Install LICENSE
   install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${gives}"
 
diff --git a/packages/spot-client-git/spot-client-git.pacscript b/packages/spot-client-git/spot-client-git.pacscript
index 3a344550b2..b7f2e4668d 100644
--- a/packages/spot-client-git/spot-client-git.pacscript
+++ b/packages/spot-client-git/spot-client-git.pacscript
@@ -12,11 +12,11 @@ external_connection=true
 arch=('amd64')
 
 build() {
-  cd "${_archive}"
+  cd "spot"
   meson target -Doffline=false --prefix="${pkgdir}/usr"
 }
 
 package() {
-  cd "${_archive}"
+  cd "spot"
   DESTDIR="${pkgdir}" ninja install -C target
 }
diff --git a/packages/st-distrotube-git/st-distrotube-git.pacscript b/packages/st-distrotube-git/st-distrotube-git.pacscript
index ad68805fd6..fa221485f0 100644
--- a/packages/st-distrotube-git/st-distrotube-git.pacscript
+++ b/packages/st-distrotube-git/st-distrotube-git.pacscript
@@ -10,11 +10,11 @@ pkgdesc="Distrotube's st build"
 breaks="st"
 
 build() {
-  cd "${_archive}"
+  cd "st-distrotube"
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "st-distrotube"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/st-lukesmith-git/st-lukesmith-git.pacscript b/packages/st-lukesmith-git/st-lukesmith-git.pacscript
index 9e83e886f0..612a45e0aa 100644
--- a/packages/st-lukesmith-git/st-lukesmith-git.pacscript
+++ b/packages/st-lukesmith-git/st-lukesmith-git.pacscript
@@ -8,6 +8,6 @@ makedepends=("make" "libharfbuzz-bin" "libxft-dev" "libpango1.0-dev")
 depends=("fontconfig")
 
 package() {
-  cd "${_archive}"
+  cd "st"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/steamtinkerlaunch-git/steamtinkerlaunch-git.pacscript b/packages/steamtinkerlaunch-git/steamtinkerlaunch-git.pacscript
index 421253fea6..10e8201d0b 100644
--- a/packages/steamtinkerlaunch-git/steamtinkerlaunch-git.pacscript
+++ b/packages/steamtinkerlaunch-git/steamtinkerlaunch-git.pacscript
@@ -19,7 +19,7 @@ maintainer=("echometerain <echometer@disroot.org>")
 pacdeps=("yad")
 
 package() {
-  cd "${_archive}"
+  cd "steamtinkerlaunch"
   install -Dm755 steamtinkerlaunch -t "${pkgdir}/usr/bin"
   install -d "${pkgdir}/usr/share/steamtinkerlaunch"
   cp -r collections eval guicfgs lang misc "${pkgdir}/usr/share/steamtinkerlaunch"
diff --git a/packages/surf-distrotube-git/surf-distrotube-git.pacscript b/packages/surf-distrotube-git/surf-distrotube-git.pacscript
index f52a7b1e5a..7f2b51d130 100644
--- a/packages/surf-distrotube-git/surf-distrotube-git.pacscript
+++ b/packages/surf-distrotube-git/surf-distrotube-git.pacscript
@@ -11,12 +11,12 @@ pkgdesc="Heavily-patched customized build of the Suckless surf web browser."
 sha256sums=("88a73c57558d0d30752184f517d0b6930133ab506383efd394b60d9a04e6513f")
 
 build() {
-  cd "${_archive}"
+  cd "surf-distrotube"
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "surf-distrotube"
   make install DESTDIR="${pkgdir}"
   install -Dm644 "LICENSE" -t "${pkgdir}/usr/share/licenses/${gives}"
   install -Dm644 "README.md" -t "${pkgdir}/usr/share/doc/${gives}"
diff --git a/packages/suru-icon-theme-git/suru-icon-theme-git.pacscript b/packages/suru-icon-theme-git/suru-icon-theme-git.pacscript
index dc521c7299..f591ff9477 100644
--- a/packages/suru-icon-theme-git/suru-icon-theme-git.pacscript
+++ b/packages/suru-icon-theme-git/suru-icon-theme-git.pacscript
@@ -8,11 +8,11 @@ makedepends=("meson" "ninja-build")
 pkgdesc="Revitalization of the Suru icon set designed for Ubuntu Touch"
 
 build() {
-  cd "${_archive}"
+  cd "suru-icon-theme"
   meson "build" --prefix="${pkgdir}/usr"
 }
 
 package() {
-  cd "${_archive}"
+  cd "suru-icon-theme"
   ninja -C "build" install > /dev/null
 }
diff --git a/packages/tdrop-git/tdrop-git.pacscript b/packages/tdrop-git/tdrop-git.pacscript
index 06f7d5447b..2d12c42899 100644
--- a/packages/tdrop-git/tdrop-git.pacscript
+++ b/packages/tdrop-git/tdrop-git.pacscript
@@ -13,12 +13,12 @@ optdepends=(
   "tmuxinator: additional session support for tmux (for -s)"
 )
 prepare() {
-  cd "${_archive}"
+  cd "tdrop"
   gzip -9n "tdrop.1"
 }
 
 package() {
-  cd "${_archive}"
+  cd "tdrop"
   install -Dm755 "tdrop" "${pkgdir}/usr/bin/tdrop"
   install -Dm644 "tdrop.1.gz" "${pkgdir}/usr/man/man1/tdrop.1.gz"
   install -Dm644 "LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
diff --git a/packages/tenacity-git/tenacity-git.pacscript b/packages/tenacity-git/tenacity-git.pacscript
index ff70b61077..ee8b4341ac 100644
--- a/packages/tenacity-git/tenacity-git.pacscript
+++ b/packages/tenacity-git/tenacity-git.pacscript
@@ -25,12 +25,12 @@ prepare() {
   else
     pyhack=()
   fi
-  cd "${_archive}"
+  cd "tenacity"
   pip3 install conan "${pyhack[@]}"
 }
 
 build() {
-  cd "${_archive}"
+  cd "tenacity"
   cmake -G Ninja -S . -B build \
     -D CMAKE_BUILD_TYPE=Release \
     -D CMAKE_INSTALL_PREFIX="${pkgdir}/usr/local"
@@ -38,6 +38,6 @@ build() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "tenacity"
   cmake --install build
 }
diff --git a/packages/torbrowser-launcher-git/torbrowser-launcher-git.pacscript b/packages/torbrowser-launcher-git/torbrowser-launcher-git.pacscript
index a9369e9c7c..6d311bb863 100644
--- a/packages/torbrowser-launcher-git/torbrowser-launcher-git.pacscript
+++ b/packages/torbrowser-launcher-git/torbrowser-launcher-git.pacscript
@@ -13,7 +13,7 @@ maintainer=("Oren Klopfer <oren@taumoda.com>")
 external_connection="true"
 
 prepare() {
-  cd "${_archive}"
+  cd "torbrowser-launcher"
   modern=("devel" "sid" "lunar" "bookworm" "mantic" "noble" "trixie" "testing" "unstable")
   for mod in "${modern[@]}"; do
     [[ ${mod} == "${DISTRO#*:}" ]] && pyhack=("--break-system-packages")
@@ -22,11 +22,11 @@ prepare() {
 }
 
 build() {
-  cd "${_archive}"
+  cd "torbrowser-launcher"
   python3 setup.py build
 }
 
 package() {
-  cd "${_archive}"
+  cd "torbrowser-launcher"
   python3 setup.py install --root="${pkgdir}" --optimize=1
 }
diff --git a/packages/touchegg-git/touchegg-git.pacscript b/packages/touchegg-git/touchegg-git.pacscript
index 9b3ff35601..1df36b4c16 100644
--- a/packages/touchegg-git/touchegg-git.pacscript
+++ b/packages/touchegg-git/touchegg-git.pacscript
@@ -9,14 +9,14 @@ pkgdesc="Touchégg is an app that runs in the background and transform the gestu
 maintainer=("Zahrun <Zahrun@github.com>")
 
 build() {
-  cd "${_archive}"
+  cd "touchegg"
   mkdir build && cd build
   cmake -DCMAKE_BUILD_TYPE=Release ..
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "touchegg"
   make install DESTDIR="${pkgdir}"
   cd "${pkgdir}"
   mv usr/local/etc .
diff --git a/packages/tre-git/tre-git.pacscript b/packages/tre-git/tre-git.pacscript
index 7e40f18a19..8d5625aa99 100644
--- a/packages/tre-git/tre-git.pacscript
+++ b/packages/tre-git/tre-git.pacscript
@@ -10,11 +10,11 @@ external_connection=true
 incompatible=("debian:bullseye")
 
 build() {
-  cd "${_archive}"
+  cd "tre"
   cargo build -j"${NCPU}" --release --locked
 }
 
 package() {
-  cd "${_archive}"
+  cd "tre"
   install -Dm755 target/release/tre -t "${pkgdir}/usr/bin"
 }
diff --git a/packages/tuner-git/tuner-git.pacscript b/packages/tuner-git/tuner-git.pacscript
index 06b99085a2..92d11a1140 100644
--- a/packages/tuner-git/tuner-git.pacscript
+++ b/packages/tuner-git/tuner-git.pacscript
@@ -9,17 +9,17 @@ replaces=("tuner")
 pkgdesc="Tuner Radio Player - development version"
 
 prepare() {
-  cd "${_archive}"
+  cd "tuner"
   meson builddir --prefix=/usr
 }
 
 build() {
-  cd "${_archive}"
+  cd "tuner"
   ninja -C builddir -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "tuner"
   DESTDIR="${pkgdir}" ninja -C builddir install
 }
 
diff --git a/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript b/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript
index dc9d19b25b..6d999db403 100644
--- a/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript
+++ b/packages/unicorn-desktop-git/unicorn-desktop-git.pacscript
@@ -20,7 +20,7 @@ maintainer=("Oren Klopfer <oren@taumoda.com>")
 incompatible=("debian:*")
 
 build() {
-  cd "${_archive}"
+  cd "unicorn"
   mkdir -p "${pkgdir}/usr/share/backgrounds"
   mkdir -p "${pkgdir}/usr/share/doc"
   mkdir -p "${pkgdir}/etc/skel/.config"
@@ -39,7 +39,7 @@ build() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "unicorn"
   # Install doc
   install -Dm644 "README.md" -t "${pkgdir}/usr/share/doc/${pkgname}"
   # Install
diff --git a/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript b/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript
index 41168c121f..99d2b5f03a 100644
--- a/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript
+++ b/packages/unicorn-mobile-git/unicorn-mobile-git.pacscript
@@ -18,7 +18,7 @@ maintainer=("Oren Klopfer <oren@taumoda.com>")
 incompatible=("debian:*")
 
 build() {
-  cd "${_archive}"
+  cd "unicorn"
   mkdir -p "${pkgdir}/usr/share/backgrounds"
   mkdir -p "${pkgdir}/usr/share/doc"
   mkdir -p "${pkgdir}/etc/skel/.config"
@@ -39,7 +39,7 @@ build() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "unicorn"
   # Install doc
   install -Dm644 "README.md" -t "${pkgdir}/usr/share/doc/${pkgname}"
   # Install
diff --git a/packages/universal-ctags-git/universal-ctags-git.pacscript b/packages/universal-ctags-git/universal-ctags-git.pacscript
index aea232e9ca..382b28c4d9 100644
--- a/packages/universal-ctags-git/universal-ctags-git.pacscript
+++ b/packages/universal-ctags-git/universal-ctags-git.pacscript
@@ -8,21 +8,21 @@ makedepends=("gcc" "make" "pkg-config" "autoconf" "automake" "python3-docutils"
 maintainer=("KwonNam Son <kwon37xi@gmail.com>")
 
 prepare() {
-  cd "${_archive}"
+  cd "ctags"
   git fetch --all --tags --prune
   git checkout "tags/${pkgver}" -b "${pkgver}"
   ./autogen.sh
 }
 
 build() {
-  cd "${_archive}"
+  cd "ctags"
   ./configure --prefix="${pkgdir}/usr" --program-transform-name='s/ctags/ctags-universal/'
   make -j"${NCPU}"
 
 }
 
 package() {
-  cd "${_archive}"
+  cd "ctags"
   make install
 }
 
diff --git a/packages/vega-strike-engine-git/vega-strike-engine-git.pacscript b/packages/vega-strike-engine-git/vega-strike-engine-git.pacscript
index bd5b1312bd..04d94e7ed5 100644
--- a/packages/vega-strike-engine-git/vega-strike-engine-git.pacscript
+++ b/packages/vega-strike-engine-git/vega-strike-engine-git.pacscript
@@ -10,7 +10,7 @@ pkgdesc="Vega Strike engine"
 maintainer=("echometerain <echometer@disroot.org>")
 
 build() {
-  cd "${_archive}"
+  cd "Vega-Strike-Engine-Source"
   mkdir build
   cd build || return 1
   cmake "../engine"
@@ -20,7 +20,7 @@ build() {
 }
 
 package() {
-  cd "${_archive}"
+  cd "Vega-Strike-Engine-Source"
   cd build || return 1
   make install DESTDIR="${pkgdir}"
   rm -rf "${pkgdir}/usr/include"
diff --git a/packages/vega-strike-git/vega-strike-git.pacscript b/packages/vega-strike-git/vega-strike-git.pacscript
index 08f3ad927e..1f34929a1c 100644
--- a/packages/vega-strike-git/vega-strike-git.pacscript
+++ b/packages/vega-strike-git/vega-strike-git.pacscript
@@ -8,12 +8,12 @@ pacdeps="vega-strike-engine-git"
 maintainer=("echometerain <echometer@disroot.org>")
 
 build() {
-  cd "${_archive}"
+  cd "Assets-Production"
   cmake "./CMakeLists.txt"
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "Assets-Production"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/weechat-git/weechat-git.pacscript b/packages/weechat-git/weechat-git.pacscript
index ac920e93bd..7832013b18 100644
--- a/packages/weechat-git/weechat-git.pacscript
+++ b/packages/weechat-git/weechat-git.pacscript
@@ -10,17 +10,17 @@ breaks="${gives}-devel ${gives}"
 pkgdesc="Free chat client, fast and light, designed for many operating systems"
 
 prepare() {
-  cd "${_archive}"
+  cd "weechat"
   ./autogen.sh
 }
 
 build() {
-  cd "${_archive}"
+  cd "weechat"
   ./configure
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "weechat"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/whatsie-git/whatsie-git.pacscript b/packages/whatsie-git/whatsie-git.pacscript
index 4f570c5d7f..86ec5d0339 100644
--- a/packages/whatsie-git/whatsie-git.pacscript
+++ b/packages/whatsie-git/whatsie-git.pacscript
@@ -10,12 +10,12 @@ depends=("libqt5webengine5" "libqt5webenginewidgets5" "libqt5location5")
 makedepends=("qtbase5-dev" "qtdeclarative5-dev" "qtlocation5-dev" "libqt5webchannel5-dev" "qtwebengine5-dev" "qtwebengine5-dev-tools")
 
 build() {
-  cd "${_archive}"
+  cd "whatsie"
   qmake src
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "whatsie"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/xfce4-hotcorner-plugin-git/xfce4-hotcorner-plugin-git.pacscript b/packages/xfce4-hotcorner-plugin-git/xfce4-hotcorner-plugin-git.pacscript
index 8524725eab..0787443b80 100644
--- a/packages/xfce4-hotcorner-plugin-git/xfce4-hotcorner-plugin-git.pacscript
+++ b/packages/xfce4-hotcorner-plugin-git/xfce4-hotcorner-plugin-git.pacscript
@@ -10,11 +10,11 @@ pkgdesc="hotcorners, for XFCE"
 maintainer=("Oren Klopfer <oren@taumoda.com>")
 
 prepare() {
-  cd "${_archive}"
+  cd "xfce4-hotcorner-plugin"
   ./configure --prefix="${pkgdir}/usr"
 }
 
 package() {
-  cd "${_archive}"
+  cd "xfce4-hotcorner-plugin"
   make install
 }
diff --git a/packages/xfce4-settings-pine-git/xfce4-settings-pine-git.pacscript b/packages/xfce4-settings-pine-git/xfce4-settings-pine-git.pacscript
index aff75b794e..b7dc17ff22 100644
--- a/packages/xfce4-settings-pine-git/xfce4-settings-pine-git.pacscript
+++ b/packages/xfce4-settings-pine-git/xfce4-settings-pine-git.pacscript
@@ -9,16 +9,16 @@ maintainer=("Oren Klopfer <oren@taumoda.com>")
 pkgdesc="XFCE4 patch that allows Pine64 Devices to auto-rotate"
 
 prepare() {
-  cd "${_archive}"
+  cd "xfce4-settings"
   ./autogen.sh
 }
 
 build() {
-  cd "${_archive}"
+  cd "xfce4-settings"
   make -j"${NCPU}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "xfce4-settings"
   make install DESTDIR="${pkgdir}"
 }
diff --git a/packages/yafetch-git/yafetch-git.pacscript b/packages/yafetch-git/yafetch-git.pacscript
index 96a1db7cf1..24503c38b7 100644
--- a/packages/yafetch-git/yafetch-git.pacscript
+++ b/packages/yafetch-git/yafetch-git.pacscript
@@ -8,6 +8,6 @@ pkgdesc="Yet another fetch tool"
 maintainer=("Elsie19 <elsie19@pm.me>")
 
 package() {
-  cd "${_archive}"
+  cd "yafetch"
   install -Dm755 yafetch "${pkgdir}/usr/bin/yafetch"
 }
diff --git a/packages/youtube-dl-git/youtube-dl-git.pacscript b/packages/youtube-dl-git/youtube-dl-git.pacscript
index 6568f40cf3..77d04a6e6b 100644
--- a/packages/youtube-dl-git/youtube-dl-git.pacscript
+++ b/packages/youtube-dl-git/youtube-dl-git.pacscript
@@ -9,12 +9,12 @@ depends=("python3")
 maintainer=("KwonNam Son <kwon37xi@gmail.com>")
 
 prepare() {
-  cd "${_archive}"
+  cd "youtube-dl"
   git fetch --all --tags --prune
   git checkout "tags/${pkgver}" -b "${pkgver}"
 }
 
 package() {
-  cd "${_archive}"
+  cd "youtube-dl"
   make install PREFIX="${pkgdir}/usr" PYTHON="/usr/bin/env python3"
 }
diff --git a/packages/zsh-history-substring-search-git/zsh-history-substring-search-git.pacscript b/packages/zsh-history-substring-search-git/zsh-history-substring-search-git.pacscript
index 13a37bcfaa..ef0897c9a0 100644
--- a/packages/zsh-history-substring-search-git/zsh-history-substring-search-git.pacscript
+++ b/packages/zsh-history-substring-search-git/zsh-history-substring-search-git.pacscript
@@ -10,7 +10,7 @@ pkgdesc="ZSH port of Fish history search (up arrow)"
 maintainer=("Zahrun <Zahrun@github.com>")
 
 package() {
-  cd "${_archive}"
+  cd "zsh-history-substring-search"
   install -d "${pkgdir}/usr/share/zsh/plugins/zsh-history-substring-search"
   install -m 755 ./*.zsh -t "${pkgdir}/usr/share/zsh/plugins/zsh-history-substring-search"
 }