diff --git a/pkg/tdpeuter/PKGBUILD b/pkg/tdpeuter/PKGBUILD index 245b9b0..6a065e9 100644 --- a/pkg/tdpeuter/PKGBUILD +++ b/pkg/tdpeuter/PKGBUILD @@ -86,6 +86,7 @@ package_tdpeuter-desktop() { ) post_install() { + bash ./install.sh code --install-extension ms-vscode.cpptools } } diff --git a/pkg/tdpeuter/install.sh b/pkg/tdpeuter/install.sh deleted file mode 100755 index f28b454..0000000 --- a/pkg/tdpeuter/install.sh +++ /dev/null @@ -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 diff --git a/pkg/tdpeuter/pkg/tdpeuter-base/.BUILDINFO b/pkg/tdpeuter/pkg/tdpeuter-base/.BUILDINFO index 0bbe388..215eceb 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-base/.BUILDINFO +++ b/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-desktop-0.0.15-1-any -installed = tdpeuter-dev-0.0.15-1-any +installed = tdpeuter-base-0.0.16-1-any +installed = tdpeuter-desktop-0.0.16-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 diff --git a/pkg/tdpeuter/pkg/tdpeuter-base/.INSTALL b/pkg/tdpeuter/pkg/tdpeuter-base/.INSTALL index 75ea7d9..867a84f 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-base/.INSTALL +++ b/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 } diff --git a/pkg/tdpeuter/pkg/tdpeuter-base/.MTREE b/pkg/tdpeuter/pkg/tdpeuter-base/.MTREE index f9f6578..d01d5e4 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 d120d5f..5687298 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-base/.PKGINFO +++ b/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 diff --git a/pkg/tdpeuter/pkg/tdpeuter-desktop/.BUILDINFO b/pkg/tdpeuter/pkg/tdpeuter-desktop/.BUILDINFO index ac2179e..64ebeeb 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-desktop/.BUILDINFO +++ b/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-desktop-0.0.15-1-any -installed = tdpeuter-dev-0.0.15-1-any +installed = tdpeuter-base-0.0.16-1-any +installed = tdpeuter-desktop-0.0.16-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 diff --git a/pkg/tdpeuter/pkg/tdpeuter-desktop/.INSTALL b/pkg/tdpeuter/pkg/tdpeuter-desktop/.INSTALL index 1839c05..c3b0423 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-desktop/.INSTALL +++ b/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() { - - 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 - -} - -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_apps() { + yay -S betterbird-bin google-chrome hamsket-bin jetbrains-toolbox + yay -S rstudio-desktop-bin sway-git } install_fonts() { @@ -71,5 +47,3 @@ do_stow() { stow -d ./stow -t "/home/${user}" ${packages} } -install_software - diff --git a/pkg/tdpeuter/pkg/tdpeuter-desktop/.MTREE b/pkg/tdpeuter/pkg/tdpeuter-desktop/.MTREE index 24c6acf..99360cb 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 196e73f..b336f56 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-desktop/.PKGINFO +++ b/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 diff --git a/pkg/tdpeuter/pkg/tdpeuter-dev/.BUILDINFO b/pkg/tdpeuter/pkg/tdpeuter-dev/.BUILDINFO index 5452b0c..17c47f3 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-dev/.BUILDINFO +++ b/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-desktop-0.0.15-1-any -installed = tdpeuter-dev-0.0.15-1-any +installed = tdpeuter-base-0.0.16-1-any +installed = tdpeuter-desktop-0.0.16-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 diff --git a/pkg/tdpeuter/pkg/tdpeuter-dev/.MTREE b/pkg/tdpeuter/pkg/tdpeuter-dev/.MTREE index 4b51253..0efd720 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 2c0b4cc..4db71cc 100644 --- a/pkg/tdpeuter/pkg/tdpeuter-dev/.PKGINFO +++ b/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 diff --git a/pkg/tdpeuter/src/install.sh b/pkg/tdpeuter/src/install.sh new file mode 120000 index 0000000..16d4319 --- /dev/null +++ b/pkg/tdpeuter/src/install.sh @@ -0,0 +1 @@ +/mnt/MyFiles/.hidden/arch-pkgs/pkg/tdpeuter/install.sh \ No newline at end of file diff --git a/pkg/tdpeuter/tdpeuter-base-0.0.16-1-any.pkg.tar.zst b/pkg/tdpeuter/tdpeuter-base-0.0.16-1-any.pkg.tar.zst index 9cd6061..cd78970 100644 Binary files a/pkg/tdpeuter/tdpeuter-base-0.0.16-1-any.pkg.tar.zst and b/pkg/tdpeuter/tdpeuter-base-0.0.16-1-any.pkg.tar.zst differ diff --git a/pkg/tdpeuter/tdpeuter-base.install b/pkg/tdpeuter/tdpeuter-base.install index 75ea7d9..867a84f 100644 --- a/pkg/tdpeuter/tdpeuter-base.install +++ b/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 } diff --git a/pkg/tdpeuter/tdpeuter-desktop-0.0.16-1-any.pkg.tar.zst b/pkg/tdpeuter/tdpeuter-desktop-0.0.16-1-any.pkg.tar.zst index 9f7cefd..8d0f5e3 100644 Binary files a/pkg/tdpeuter/tdpeuter-desktop-0.0.16-1-any.pkg.tar.zst and b/pkg/tdpeuter/tdpeuter-desktop-0.0.16-1-any.pkg.tar.zst differ diff --git a/pkg/tdpeuter/tdpeuter-desktop.install b/pkg/tdpeuter/tdpeuter-desktop.install index 1839c05..c3b0423 100644 --- a/pkg/tdpeuter/tdpeuter-desktop.install +++ b/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() { - - 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 - -} - -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_apps() { + yay -S betterbird-bin google-chrome hamsket-bin jetbrains-toolbox + yay -S rstudio-desktop-bin sway-git } install_fonts() { @@ -71,5 +47,3 @@ do_stow() { stow -d ./stow -t "/home/${user}" ${packages} } -install_software - diff --git a/pkg/tdpeuter/tdpeuter-dev-0.0.16-1-any.pkg.tar.zst b/pkg/tdpeuter/tdpeuter-dev-0.0.16-1-any.pkg.tar.zst index d9e7e85..525aff3 100644 Binary files a/pkg/tdpeuter/tdpeuter-dev-0.0.16-1-any.pkg.tar.zst and b/pkg/tdpeuter/tdpeuter-dev-0.0.16-1-any.pkg.tar.zst differ diff --git a/pkg/tdpeuter/tdpeuter.db b/pkg/tdpeuter/tdpeuter.db index c27b8a8..66dcf9f 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 c27b8a8..66dcf9f 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 1fda5f3..c27b8a8 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 27353cb..4455f53 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 27353cb..4455f53 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 a46deb0..27353cb 100644 Binary files a/pkg/tdpeuter/tdpeuter.files.tar.gz.old and b/pkg/tdpeuter/tdpeuter.files.tar.gz.old differ