diff --git a/pkg/tdpeuter/pkg/tdpeuter-base/.BUILDINFO b/pkg/tdpeuter/pkg/tdpeuter-base/.BUILDINFO index 7d8954d..2ee6ac7 100644 --- 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 diff --git a/pkg/tdpeuter/pkg/tdpeuter-base/.MTREE b/pkg/tdpeuter/pkg/tdpeuter-base/.MTREE index 7b8e848..d06269d 100644 Binary files a/pkg/tdpeuter/pkg/tdpeuter-base/.MTREE and b/pkg/tdpeuter/pkg/tdpeuter-base/.MTREE differ diff --git a/pkg/tdpeuter/pkg/tdpeuter-base/.PKGINFO b/pkg/tdpeuter/pkg/tdpeuter-base/.PKGINFO index a2be32e..a4fb0d9 100644 --- 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 diff --git a/pkg/tdpeuter/pkg/tdpeuter-desktop/.BUILDINFO b/pkg/tdpeuter/pkg/tdpeuter-desktop/.BUILDINFO index 0185e8c..f06aef4 100644 --- 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 diff --git a/pkg/tdpeuter/pkg/tdpeuter-desktop/.INSTALL b/pkg/tdpeuter/pkg/tdpeuter-desktop/.INSTALL index c360c07..d96baa8 100644 --- 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 diff --git a/pkg/tdpeuter/pkg/tdpeuter-desktop/.MTREE b/pkg/tdpeuter/pkg/tdpeuter-desktop/.MTREE index a6697f0..2e9abff 100644 Binary files a/pkg/tdpeuter/pkg/tdpeuter-desktop/.MTREE and b/pkg/tdpeuter/pkg/tdpeuter-desktop/.MTREE differ diff --git a/pkg/tdpeuter/pkg/tdpeuter-desktop/.PKGINFO b/pkg/tdpeuter/pkg/tdpeuter-desktop/.PKGINFO index 2ec3722..523ab6c 100644 --- 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 diff --git a/pkg/tdpeuter/pkg/tdpeuter-dev/.BUILDINFO b/pkg/tdpeuter/pkg/tdpeuter-dev/.BUILDINFO index de1ed74..41240b1 100644 --- 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 diff --git a/pkg/tdpeuter/pkg/tdpeuter-dev/.MTREE b/pkg/tdpeuter/pkg/tdpeuter-dev/.MTREE index 007874e..343f42f 100644 Binary files a/pkg/tdpeuter/pkg/tdpeuter-dev/.MTREE and b/pkg/tdpeuter/pkg/tdpeuter-dev/.MTREE differ diff --git a/pkg/tdpeuter/pkg/tdpeuter-dev/.PKGINFO b/pkg/tdpeuter/pkg/tdpeuter-dev/.PKGINFO index 6722bcf..13671e5 100644 --- 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 diff --git 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 index 03bacff..b8aa4e2 100644 Binary files a/pkg/tdpeuter/tdpeuter-base-0.0.14-1-any.pkg.tar.zst and b/pkg/tdpeuter/tdpeuter-base-0.0.14-1-any.pkg.tar.zst differ diff --git 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 index df97187..ccf920f 100644 Binary files a/pkg/tdpeuter/tdpeuter-desktop-0.0.14-1-any.pkg.tar.zst and b/pkg/tdpeuter/tdpeuter-desktop-0.0.14-1-any.pkg.tar.zst differ diff --git a/pkg/tdpeuter/tdpeuter-desktop.install b/pkg/tdpeuter/tdpeuter-desktop.install index c360c07..d96baa8 100644 --- 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 diff --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 index c935850..b9c9b10 100644 Binary files a/pkg/tdpeuter/tdpeuter-dev-0.0.14-1-any.pkg.tar.zst and b/pkg/tdpeuter/tdpeuter-dev-0.0.14-1-any.pkg.tar.zst differ diff --git a/pkg/tdpeuter/tdpeuter.db b/pkg/tdpeuter/tdpeuter.db index c238098..458ff06 100644 Binary files a/pkg/tdpeuter/tdpeuter.db and b/pkg/tdpeuter/tdpeuter.db differ diff --git a/pkg/tdpeuter/tdpeuter.db.tar.gz b/pkg/tdpeuter/tdpeuter.db.tar.gz index c238098..458ff06 100644 Binary files a/pkg/tdpeuter/tdpeuter.db.tar.gz and b/pkg/tdpeuter/tdpeuter.db.tar.gz differ diff --git a/pkg/tdpeuter/tdpeuter.db.tar.gz.old b/pkg/tdpeuter/tdpeuter.db.tar.gz.old index 0d38186..37d206a 100644 Binary files a/pkg/tdpeuter/tdpeuter.db.tar.gz.old and b/pkg/tdpeuter/tdpeuter.db.tar.gz.old differ diff --git a/pkg/tdpeuter/tdpeuter.files b/pkg/tdpeuter/tdpeuter.files index 2b2aadd..d597898 100644 Binary files a/pkg/tdpeuter/tdpeuter.files and b/pkg/tdpeuter/tdpeuter.files differ diff --git a/pkg/tdpeuter/tdpeuter.files.tar.gz b/pkg/tdpeuter/tdpeuter.files.tar.gz index 2b2aadd..d597898 100644 Binary files a/pkg/tdpeuter/tdpeuter.files.tar.gz and b/pkg/tdpeuter/tdpeuter.files.tar.gz differ diff --git a/pkg/tdpeuter/tdpeuter.files.tar.gz.old b/pkg/tdpeuter/tdpeuter.files.tar.gz.old index f4bb01b..dca21d1 100644 Binary files a/pkg/tdpeuter/tdpeuter.files.tar.gz.old and b/pkg/tdpeuter/tdpeuter.files.tar.gz.old differ