Adding yay

pkg/tdpeuter/PKGBUILD

@@ -86,6 +86,7 @@ package_tdpeuter-desktop() {
     )
 
     post_install() {
+        bash ./install.sh
         code --install-extension ms-vscode.cpptools
     }
 }

pkg/tdpeuter/install.sh

@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-cd "${1}"
-
->&2 echo "Installing ${2}"
-git clone --depth 1 --progress "https://aur.archlinux.org/${2}.git"
-cd "${2}"
-git pull
-
-makepkg -isc --asdeps "tdpeuter-desktop" --noconfirm

pkg/tdpeuter/pkg/tdpeuter-base/.BUILDINFO

@@ -3,9 +3,9 @@ pkgname = tdpeuter-base
 pkgbase = tdpeuter
 pkgver = 0.0.16-1
 pkgarch = any
-pkgbuild_sha256sum = 5cff1ab6b98c539c9ee95300a8196e360b345c7adcb1b60e3c3153f5ad687adf
+pkgbuild_sha256sum = aa6da9307dd728c75067ec2eb471cfe612a7a324adcb3802e6d21ea7001e895b
 packager = Unknown Packager
-builddate = 1666855896
+builddate = 1666858154
 builddir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter
 startdir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter
 buildtool = makepkg
@@ -654,9 +654,9 @@ installed = systemd-251.7-1-x86_64
 installed = systemd-libs-251.7-1-x86_64
 installed = systemd-sysvcompat-251.7-1-x86_64
 installed = tar-1.34-1-x86_64
-installed = tdpeuter-base-0.0.15-1-any
+installed = tdpeuter-base-0.0.16-1-any
-installed = tdpeuter-desktop-0.0.15-1-any
+installed = tdpeuter-desktop-0.0.16-1-any
-installed = tdpeuter-dev-0.0.15-1-any
+installed = tdpeuter-dev-0.0.16-1-any
 installed = tdpeuter-me-0.0.10-1-any
 installed = termshark-2.4.0-1-x86_64
 installed = texinfo-6.8-2-x86_64

pkg/tdpeuter/pkg/tdpeuter-base/.INSTALL

@@ -6,6 +6,6 @@ post_install() {
     systemctl disable --now bluetooth.service
 
     >&2 echo "Fixing locale"
-    sed -i "s/^#\(nl_BE.UTF-8 UTF-8\)$/\1/g" "/etc/locale.gen"
+    sed -i "s/^#\(en_GB.UTF-8 UTF-8\)$/\1/g" "/etc/locale.gen"
     locale-gen
 }

pkg/tdpeuter/pkg/tdpeuter-base/.PKGINFO

@@ -5,7 +5,7 @@ pkgbase = tdpeuter
 pkgver = 0.0.16-1
 pkgdesc = Sysconfig for my systems
 url = https://git.depeuter.tk/tdpeuter/arch-pkgs
-builddate = 1666855896
+builddate = 1666858154
 packager = Unknown Packager
 size = 0
 arch = any

pkg/tdpeuter/pkg/tdpeuter-desktop/.BUILDINFO

@@ -3,9 +3,9 @@ pkgname = tdpeuter-desktop
 pkgbase = tdpeuter
 pkgver = 0.0.16-1
 pkgarch = any
-pkgbuild_sha256sum = 5cff1ab6b98c539c9ee95300a8196e360b345c7adcb1b60e3c3153f5ad687adf
+pkgbuild_sha256sum = aa6da9307dd728c75067ec2eb471cfe612a7a324adcb3802e6d21ea7001e895b
 packager = Unknown Packager
-builddate = 1666855896
+builddate = 1666858154
 builddir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter
 startdir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter
 buildtool = makepkg
@@ -654,9 +654,9 @@ installed = systemd-251.7-1-x86_64
 installed = systemd-libs-251.7-1-x86_64
 installed = systemd-sysvcompat-251.7-1-x86_64
 installed = tar-1.34-1-x86_64
-installed = tdpeuter-base-0.0.15-1-any
+installed = tdpeuter-base-0.0.16-1-any
-installed = tdpeuter-desktop-0.0.15-1-any
+installed = tdpeuter-desktop-0.0.16-1-any
-installed = tdpeuter-dev-0.0.15-1-any
+installed = tdpeuter-dev-0.0.16-1-any
 installed = tdpeuter-me-0.0.10-1-any
 installed = termshark-2.4.0-1-x86_64
 installed = texinfo-6.8-2-x86_64

pkg/tdpeuter/pkg/tdpeuter-desktop/.INSTALL

@@ -7,7 +7,7 @@ post_install() {
 }
 
 post_upgrade() {
-    install_software
+    install_apps
     install_fonts
     do_stow
 }
@@ -16,33 +16,9 @@ pre_remove() {
     rm -rf /usr/share/tdpeuter/arch-pkgs
 }
 
-install_one() {
+install_apps() {
-
+    yay -S betterbird-bin google-chrome hamsket-bin jetbrains-toolbox
-    cd "${1}"
+    yay -S rstudio-desktop-bin sway-git
-
-    >&2 echo "Installing ${2}"
-    git clone --depth 1 --progress "https://aur.archlinux.org/${2}.git"
-    cd "${2}"
-    git pull
-
-    makepkg -isc --asdeps "tdpeuter-desktop" --noconfirm
-
-}
-
-install_software() {
-    
-    user=$(who | cut -f1 -d' ' | head -n 1)
-    dir="/home/${user}/.cache/tdpeuter"
-    mkdir -p "${dir}"
-    chown -R "${user}" "${dir}"
-
-    su -c "install_one \"${dir}\" \"betterbird-bin\"" "${user}"
-    su -c "install_one \"${dir}\" \"gooogle-chrome\"" "${user}"
-    su -c "install_one \"${dir}\" \"hamsket-bin\"" "${user}"
-    su -c "install_one \"${dir}\" \"jetbrains-toolbox\"" "${user}"
-    su -c "install_one \"${dir}\" \"rstudio-dekstop-bin\"" "${user}"
-    su -c "install_one \"${dir}\" \"sway-git\"" "${user}"
-
 }
 
 install_fonts() {
@@ -71,5 +47,3 @@ do_stow() {
     stow -d ./stow -t "/home/${user}" ${packages}
 }
 
-install_software
-

pkg/tdpeuter/pkg/tdpeuter-desktop/.PKGINFO

@@ -5,7 +5,7 @@ pkgbase = tdpeuter
 pkgver = 0.0.16-1
 pkgdesc = Sysconfig for my systems
 url = https://git.depeuter.tk/tdpeuter/arch-pkgs
-builddate = 1666855896
+builddate = 1666858154
 packager = Unknown Packager
 size = 0
 arch = any

pkg/tdpeuter/pkg/tdpeuter-dev/.BUILDINFO

@@ -3,9 +3,9 @@ pkgname = tdpeuter-dev
 pkgbase = tdpeuter
 pkgver = 0.0.16-1
 pkgarch = any
-pkgbuild_sha256sum = 5cff1ab6b98c539c9ee95300a8196e360b345c7adcb1b60e3c3153f5ad687adf
+pkgbuild_sha256sum = aa6da9307dd728c75067ec2eb471cfe612a7a324adcb3802e6d21ea7001e895b
 packager = Unknown Packager
-builddate = 1666855896
+builddate = 1666858154
 builddir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter
 startdir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter
 buildtool = makepkg
@@ -654,9 +654,9 @@ installed = systemd-251.7-1-x86_64
 installed = systemd-libs-251.7-1-x86_64
 installed = systemd-sysvcompat-251.7-1-x86_64
 installed = tar-1.34-1-x86_64
-installed = tdpeuter-base-0.0.15-1-any
+installed = tdpeuter-base-0.0.16-1-any
-installed = tdpeuter-desktop-0.0.15-1-any
+installed = tdpeuter-desktop-0.0.16-1-any
-installed = tdpeuter-dev-0.0.15-1-any
+installed = tdpeuter-dev-0.0.16-1-any
 installed = tdpeuter-me-0.0.10-1-any
 installed = termshark-2.4.0-1-x86_64
 installed = texinfo-6.8-2-x86_64

pkg/tdpeuter/pkg/tdpeuter-dev/.PKGINFO

@@ -5,7 +5,7 @@ pkgbase = tdpeuter
 pkgver = 0.0.16-1
 pkgdesc = Sysconfig for my systems
 url = https://git.depeuter.tk/tdpeuter/arch-pkgs
-builddate = 1666855896
+builddate = 1666858154
 packager = Unknown Packager
 size = 0
 arch = any

pkg/tdpeuter/src/install.sh

@@ -0,0 +1 @@
+/mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter/install.sh

pkg/tdpeuter/tdpeuter-base.install

@@ -6,6 +6,6 @@ post_install() {
     systemctl disable --now bluetooth.service
 
     >&2 echo "Fixing locale"
-    sed -i "s/^#\(nl_BE.UTF-8 UTF-8\)$/\1/g" "/etc/locale.gen"
+    sed -i "s/^#\(en_GB.UTF-8 UTF-8\)$/\1/g" "/etc/locale.gen"
     locale-gen
 }

pkg/tdpeuter/tdpeuter-desktop.install

@@ -7,7 +7,7 @@ post_install() {
 }
 
 post_upgrade() {
-    install_software
+    install_apps
     install_fonts
     do_stow
 }
@@ -16,33 +16,9 @@ pre_remove() {
     rm -rf /usr/share/tdpeuter/arch-pkgs
 }
 
-install_one() {
+install_apps() {
-
+    yay -S betterbird-bin google-chrome hamsket-bin jetbrains-toolbox
-    cd "${1}"
+    yay -S rstudio-desktop-bin sway-git
-
-    >&2 echo "Installing ${2}"
-    git clone --depth 1 --progress "https://aur.archlinux.org/${2}.git"
-    cd "${2}"
-    git pull
-
-    makepkg -isc --asdeps "tdpeuter-desktop" --noconfirm
-
-}
-
-install_software() {
-    
-    user=$(who | cut -f1 -d' ' | head -n 1)
-    dir="/home/${user}/.cache/tdpeuter"
-    mkdir -p "${dir}"
-    chown -R "${user}" "${dir}"
-
-    su -c "install_one \"${dir}\" \"betterbird-bin\"" "${user}"
-    su -c "install_one \"${dir}\" \"gooogle-chrome\"" "${user}"
-    su -c "install_one \"${dir}\" \"hamsket-bin\"" "${user}"
-    su -c "install_one \"${dir}\" \"jetbrains-toolbox\"" "${user}"
-    su -c "install_one \"${dir}\" \"rstudio-dekstop-bin\"" "${user}"
-    su -c "install_one \"${dir}\" \"sway-git\"" "${user}"
-
 }
 
 install_fonts() {
@@ -71,5 +47,3 @@ do_stow() {
     stow -d ./stow -t "/home/${user}" ${packages}
 }
 
-install_software
-