Try uncountable

2022-10-26 23:54:29 +02:00 · 2022-10-26 23:54:29 +02:00 · fbf65bed76
commit fbf65bed76
parent 4afb5626cc
20 changed files with 30 additions and 30 deletions
--- a/pkg/tdpeuter/pkg/tdpeuter-base/.BUILDINFO
+++ b/pkg/tdpeuter/pkg/tdpeuter-base/.BUILDINFO
@ -5,7 +5,7 @@ pkgver = 0.0.14-1
 pkgarch = any
 pkgbuild_sha256sum = 61953a817e53523af8a095afc181e733c19654b7aba09d9b5546ac593f5bbd17
 packager = Unknown Packager
-builddate = 1666820843
+builddate = 1666821266
 builddir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter
 startdir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter
 buildtool = makepkg
--- a/pkg/tdpeuter/pkg/tdpeuter-base/.MTREE
+++ b/pkg/tdpeuter/pkg/tdpeuter-base/.MTREE
--- a/pkg/tdpeuter/pkg/tdpeuter-base/.PKGINFO
+++ b/pkg/tdpeuter/pkg/tdpeuter-base/.PKGINFO
@ -5,7 +5,7 @@ pkgbase = tdpeuter
 pkgver = 0.0.14-1
 pkgdesc = Sysconfig for my systems
 url = https://git.depeuter.tk/tdpeuter/arch-pkgs
-builddate = 1666820843
+builddate = 1666821266
 packager = Unknown Packager
 size = 0
 arch = any
--- a/pkg/tdpeuter/pkg/tdpeuter-desktop/.BUILDINFO
+++ b/pkg/tdpeuter/pkg/tdpeuter-desktop/.BUILDINFO
@ -5,7 +5,7 @@ pkgver = 0.0.14-1
 pkgarch = any
 pkgbuild_sha256sum = 61953a817e53523af8a095afc181e733c19654b7aba09d9b5546ac593f5bbd17
 packager = Unknown Packager
-builddate = 1666820843
+builddate = 1666821266
 builddir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter
 startdir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter
 buildtool = makepkg
--- a/pkg/tdpeuter/pkg/tdpeuter-desktop/.INSTALL
+++ b/pkg/tdpeuter/pkg/tdpeuter-desktop/.INSTALL
@ -16,22 +16,22 @@ pre_remove() {
    rm -rf /usr/share/tdpeuter/arch-pkgs
 }

-install_software() {
+install_one() {
+
    user=$(who | cut -f1 -d' ')
+    dir=$(pwd)

-    >&2 echo "Installing betterbird"
-    git clone --depth 1 --progress https://aur.archlinux.org/betterbird-bin.git
-    cd betterbird-bin
+    >&2 echo "Installing ${1}"
+    git clone --depth 1 --progress "https://aur.archlinux.org/${1}.git"
+    cd "${1}"
    git pull
-    $(su -w PATH -c "makepkg -ic" - "${user}")
-    cd

-    >&2 echo "Installing google-chrome"
-    git clone --depth 1 --progress https://aur.archlinux.org/google-chrome.git
-    cd google-chrome
-    git pull
-    $(su -w PATH -c "makepkg -ic" - "${user}")
-    cd
+    su -c "cd ${dir} && makepkg -ic" - "${user}"
+}
+
+install_software() {
+    install_one "betterbird-bin"
+    install_one "google-chrome"

    >&2 echo "Installing hamsket"
    git clone --depth 1 --progress https://aur.archlinux.org/hamsket-bin.git
--- a/pkg/tdpeuter/pkg/tdpeuter-desktop/.MTREE
+++ b/pkg/tdpeuter/pkg/tdpeuter-desktop/.MTREE
--- a/pkg/tdpeuter/pkg/tdpeuter-desktop/.PKGINFO
+++ b/pkg/tdpeuter/pkg/tdpeuter-desktop/.PKGINFO
@ -5,7 +5,7 @@ pkgbase = tdpeuter
 pkgver = 0.0.14-1
 pkgdesc = Sysconfig for my systems
 url = https://git.depeuter.tk/tdpeuter/arch-pkgs
-builddate = 1666820843
+builddate = 1666821266
 packager = Unknown Packager
 size = 0
 arch = any
--- a/pkg/tdpeuter/pkg/tdpeuter-dev/.BUILDINFO
+++ b/pkg/tdpeuter/pkg/tdpeuter-dev/.BUILDINFO
@ -5,7 +5,7 @@ pkgver = 0.0.14-1
 pkgarch = any
 pkgbuild_sha256sum = 61953a817e53523af8a095afc181e733c19654b7aba09d9b5546ac593f5bbd17
 packager = Unknown Packager
-builddate = 1666820843
+builddate = 1666821266
 builddir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter
 startdir = /mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter
 buildtool = makepkg
--- a/pkg/tdpeuter/pkg/tdpeuter-dev/.MTREE
+++ b/pkg/tdpeuter/pkg/tdpeuter-dev/.MTREE
--- a/pkg/tdpeuter/pkg/tdpeuter-dev/.PKGINFO
+++ b/pkg/tdpeuter/pkg/tdpeuter-dev/.PKGINFO
@ -5,7 +5,7 @@ pkgbase = tdpeuter
 pkgver = 0.0.14-1
 pkgdesc = Sysconfig for my systems
 url = https://git.depeuter.tk/tdpeuter/arch-pkgs
-builddate = 1666820843
+builddate = 1666821266
 packager = Unknown Packager
 size = 0
 arch = any
--- a/pkg/tdpeuter/tdpeuter-base-0.0.14-1-any.pkg.tar.zst
+++ b/pkg/tdpeuter/tdpeuter-base-0.0.14-1-any.pkg.tar.zst
--- a/pkg/tdpeuter/tdpeuter-desktop-0.0.14-1-any.pkg.tar.zst
+++ b/pkg/tdpeuter/tdpeuter-desktop-0.0.14-1-any.pkg.tar.zst
--- a/pkg/tdpeuter/tdpeuter-desktop.install
+++ b/pkg/tdpeuter/tdpeuter-desktop.install
@ -16,22 +16,22 @@ pre_remove() {
    rm -rf /usr/share/tdpeuter/arch-pkgs
 }

-install_software() {
+install_one() {
+
    user=$(who | cut -f1 -d' ')
+    dir=$(pwd)

-    >&2 echo "Installing betterbird"
-    git clone --depth 1 --progress https://aur.archlinux.org/betterbird-bin.git
-    cd betterbird-bin
+    >&2 echo "Installing ${1}"
+    git clone --depth 1 --progress "https://aur.archlinux.org/${1}.git"
+    cd "${1}"
    git pull
-    $(su -w PATH -c "makepkg -ic" - "${user}")
-    cd

-    >&2 echo "Installing google-chrome"
-    git clone --depth 1 --progress https://aur.archlinux.org/google-chrome.git
-    cd google-chrome
-    git pull
-    $(su -w PATH -c "makepkg -ic" - "${user}")
-    cd
+    su -c "cd ${dir} && makepkg -ic" - "${user}"
+}
+
+install_software() {
+    install_one "betterbird-bin"
+    install_one "google-chrome"

    >&2 echo "Installing hamsket"
    git clone --depth 1 --progress https://aur.archlinux.org/hamsket-bin.git
--- a/pkg/tdpeuter/tdpeuter-dev-0.0.14-1-any.pkg.tar.zst
+++ b/pkg/tdpeuter/tdpeuter-dev-0.0.14-1-any.pkg.tar.zst
--- a/pkg/tdpeuter/tdpeuter.db
+++ b/pkg/tdpeuter/tdpeuter.db
--- a/pkg/tdpeuter/tdpeuter.db.tar.gz
+++ b/pkg/tdpeuter/tdpeuter.db.tar.gz
--- a/pkg/tdpeuter/tdpeuter.db.tar.gz.old
+++ b/pkg/tdpeuter/tdpeuter.db.tar.gz.old
--- a/pkg/tdpeuter/tdpeuter.files
+++ b/pkg/tdpeuter/tdpeuter.files
--- a/pkg/tdpeuter/tdpeuter.files.tar.gz
+++ b/pkg/tdpeuter/tdpeuter.files.tar.gz
--- a/pkg/tdpeuter/tdpeuter.files.tar.gz.old
+++ b/pkg/tdpeuter/tdpeuter.files.tar.gz.old