From 1fe12840896297685dae4a2ef9789dae24b380c5 Mon Sep 17 00:00:00 2001
From: ZeStig <69384921+zstg@users.noreply.github.com>
Date: Tue, 24 Dec 2024 16:00:56 +0530
Subject: [PATCH] Rebuild all packages

---
 build.sh | 154 +++++++++++++++++++++++++++----------------------------
 1 file changed, 77 insertions(+), 77 deletions(-)

diff --git a/build.sh b/build.sh
index c2ebfbe..7c69ddc 100644
--- a/build.sh
+++ b/build.sh
@@ -83,39 +83,39 @@ build_and_package() {
     dir="$PWD"
     sudo git config --global init.defaultBranch main
 
-    # local packages=(
-    #     "albert" 
-    #     "aura-bin"
-    #     # "aurutils"
-    #     "bibata-cursor-theme-bin"
-    #     # "brave-bin"
-    #     # #"eww"    
-    #     # "google-chrome"
-    #     # "gruvbox-plus-icon-theme-git" 
-    #     # "libadwaita-without-adwaita-git" 
-    #     # "mkinitcpio-openswap" 
-	# "mu" # TODO find a way to not pull in Emacs as a dependency
-    #     # "nwg-clipman"
-    #     "nwg-dock-hyprland-bin" 
-    #     # "octopi"
-    #     "oh-my-zsh-git"
-    #     # "pamac-all"
-    #     "pandoc-bin" 
-    #     "python-clickgen"
-    #     # "pyprland"
-    #     # #"repoctl"
-    #     # "rua"
-    #     "swayfx"
-    #     # "sway-nvidia"
-    #     "swayosd-git"
-    #     "ventoy-bin" 
-    #     "yay-bin"
-    #     "zen-browser-bin"
-    # )
-
-    # for i in "${packages[@]}"; do
-    #     clone_and_build_if_needed "$i" "$dir"
-    # done
+    local packages=(
+        "albert" 
+        "aura-bin"
+        # "aurutils"
+        "bibata-cursor-theme-bin"
+        # "brave-bin"
+        # #"eww"    
+        # "google-chrome"
+        # "gruvbox-plus-icon-theme-git" 
+        # "libadwaita-without-adwaita-git" 
+        # "mkinitcpio-openswap" 
+	"mu" # TODO find a way to not pull in Emacs as a dependency
+        # "nwg-clipman"
+        "nwg-dock-hyprland-bin" 
+        # "octopi"
+        "oh-my-zsh-git"
+        # "pamac-all"
+        "pandoc-bin" 
+        "python-clickgen"
+        # "pyprland"
+        # #"repoctl"
+        # "rua"
+        "swayfx"
+        # "sway-nvidia"
+        "swayosd-git"
+        "ventoy-bin" 
+        "yay-bin"
+        "zen-browser-bin"
+    )
+
+    for i in "${packages[@]}"; do
+        clone_and_build_if_needed "$i" "$dir"
+    done
 
     # # # sudo pacman -U $dir/x86_64/ckbcomp-1.227-1-any.pkg.tar.zst --noconfirm
     # # sudo pacman -U $dir/x86_64/repoctl-0.22.2-1-x86_64.pkg.tar.zst --noconfirm
@@ -127,51 +127,51 @@ build_and_package() {
     # mv *.pkg.tar.zst "$dir"/x86_64/
     # cd "$dir"/
 
-    # mkdir -p /tmp/litefm && chmod -R 777 /tmp/litefm
-    # cp "$dir"/PKGBUILDS/litefm/PKGBUILD /tmp/litefm
-    # cd /tmp/litefm
-    # rm -f "$dir"/x86_64/**litefm**.pkg.tar.zst
-    # sudo -u builder makepkg -cfs --noconfirm # --sign
-    # mv *.pkg.tar.zst "$dir"/x86_64/
-    # cd "$dir"/
+    mkdir -p /tmp/litefm && chmod -R 777 /tmp/litefm
+    cp "$dir"/PKGBUILDS/litefm/PKGBUILD /tmp/litefm
+    cd /tmp/litefm
+    rm -f "$dir"/x86_64/**litefm**.pkg.tar.zst
+    sudo -u builder makepkg -cfs --noconfirm # --sign
+    mv *.pkg.tar.zst "$dir"/x86_64/
+    cd "$dir"/
+
+    mkdir -p /tmp/ckbcomp
+    cp "$dir"/PKGBUILDS/ckbcomp/PKGBUILD /tmp/ckbcomp
+    cd /tmp/ckbcomp
+    sudo chmod -R 777 /tmp/ckbcomp
+    sudo -u builder makepkg -cfs --noconfirm
+    rm -f **debug**.pkg.tar.zst
+    cp *.pkg.tar.zst "$dir"/x86_64/
+    sudo pacman -U *.pkg.tar.zst --noconfirm
+    cd "$dir"
 
-    # mkdir -p /tmp/ckbcomp
-    # cp "$dir"/PKGBUILDS/ckbcomp/PKGBUILD /tmp/ckbcomp
-    # cd /tmp/ckbcomp
-    # sudo chmod -R 777 /tmp/ckbcomp
-    # sudo -u builder makepkg -cfs --noconfirm
-    # rm -f **debug**.pkg.tar.zst
-    # cp *.pkg.tar.zst "$dir"/x86_64/
-    # sudo pacman -U *.pkg.tar.zst --noconfirm
-    # cd "$dir"
+    cd "$dir"/PKGBUILDS/calamares
+    sudo chmod -R 777 "$dir"/PKGBUILDS/calamares
+    sudo -u builder makepkg -cfs --noconfirm # --sign
+    echo "Removing Qt Calamares build..."
+    sudo rm -v **qt5**.pkg.tar.zst
+    sudo rm -rfv *.tar.gz **debug**.pkg.tar.zst calamares/ src/ pkg/
+    rm -fv "$dir"/x86_64/**calamares**.pkg.tar.zst
+    mv -v *.pkg.tar.zst "$dir"/x86_64/
+    cd "$dir"
 
-    # cd "$dir"/PKGBUILDS/calamares
-    # sudo chmod -R 777 "$dir"/PKGBUILDS/calamares
-    # sudo -u builder makepkg -cfs --noconfirm # --sign
-    # echo "Removing Qt Calamares build..."
-    # sudo rm -v **qt5**.pkg.tar.zst
-    # sudo rm -rfv *.tar.gz **debug**.pkg.tar.zst calamares/ src/ pkg/
-    # rm -fv "$dir"/x86_64/**calamares**.pkg.tar.zst
-    # mv -v *.pkg.tar.zst "$dir"/x86_64/
-    # cd "$dir"
-
-    # mkdir -p /tmp/grab
-    # cp "$dir"/PKGBUILDS/grab/PKGBUILD /tmp/grab
-    # cd /tmp/grab
-    # sudo chmod -R 777 /tmp/grab
-    # sudo -u builder makepkg -cfs --noconfirm
-    # rm -f **debug**.pkg.tar.zst
-    # cp *.pkg.tar.zst "$dir"/x86_64/
-    # cd "$dir"
-
-    # mkdir -p /tmp/maneki-neko
-    # cp "$dir"/PKGBUILDS/maneki-neko/PKGBUILD /tmp/maneki-neko
-    # cd /tmp/maneki-neko
-    # sudo chmod -R 777 /tmp/maneki-neko
-    # sudo -u builder makepkg -cfs --noconfirm
-    # rm -f **debug**.pkg.tar.zst
-    # cp *.pkg.tar.zst "$dir"/x86_64/
-    # cd "$dir"
+    mkdir -p /tmp/grab
+    cp "$dir"/PKGBUILDS/grab/PKGBUILD /tmp/grab
+    cd /tmp/grab
+    sudo chmod -R 777 /tmp/grab
+    sudo -u builder makepkg -cfs --noconfirm
+    rm -f **debug**.pkg.tar.zst
+    cp *.pkg.tar.zst "$dir"/x86_64/
+    cd "$dir"
+
+    mkdir -p /tmp/maneki-neko
+    cp "$dir"/PKGBUILDS/maneki-neko/PKGBUILD /tmp/maneki-neko
+    cd /tmp/maneki-neko
+    sudo chmod -R 777 /tmp/maneki-neko
+    sudo -u builder makepkg -cfs --noconfirm
+    rm -f **debug**.pkg.tar.zst
+    cp *.pkg.tar.zst "$dir"/x86_64/
+    cd "$dir"
 
     packages=(
         "stratos-bin" 
@@ -210,7 +210,7 @@ initialize_and_push() {
     sudo git add .
     sudo git commit -am "Update packages"
     export URL=$(git config --get remote.origin.url | sed "s|^https://|https://x-access-token:${GITHUB_TOKEN}@|")
-    # sudo git push "$URL" --force
+    sudo git push "$URL" --force
 }
 
 # Main function