From b9955d614560d86c4f080bc01d757c7709aeefe1 Mon Sep 17 00:00:00 2001 From: Tibo De Peuter Date: Thu, 27 Oct 2022 21:30:27 +0200 Subject: [PATCH] Fixed some stuff, still need to build --- pkg/tdpeuter/PKGBUILD | 5 ++--- pkg/tdpeuter/tdpeuter-desktop.install | 11 +++++++++-- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/pkg/tdpeuter/PKGBUILD b/pkg/tdpeuter/PKGBUILD index fd28fcc..4e9bbd1 100644 --- a/pkg/tdpeuter/PKGBUILD +++ b/pkg/tdpeuter/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Tibo De Peuter pkgbase=tdpeuter pkgname=(tdpeuter-base tdpeuter-dev tdpeuter-desktop) -pkgver=0.0.18 +pkgver=0.0.19 pkgrel=1 pkgdesc="Sysconfig for my systems" arch=(any) @@ -82,11 +82,10 @@ package_tdpeuter-desktop() { # Tools depends+=( - vifm zathura zathura-pdf-mupdf zellij zenith + vifm zathura zathura-pdf-mupdf zellij ) post_install() { - bash ./install.sh code --install-extension ms-vscode.cpptools } } diff --git a/pkg/tdpeuter/tdpeuter-desktop.install b/pkg/tdpeuter/tdpeuter-desktop.install index 40a706d..5af9e5c 100644 --- a/pkg/tdpeuter/tdpeuter-desktop.install +++ b/pkg/tdpeuter/tdpeuter-desktop.install @@ -8,7 +8,7 @@ post_install() { pacman -S --needed git base-devel git clone https://aur.archlinux.org/yay.git cd yay - su -c "makepkg -si" - tdpeuter + su -c "makepkg -si --asdeps" - tdpeuter post_upgrade } @@ -32,7 +32,14 @@ install_apps() { # Jetbrains pkgs+=" intellij-idea-ultimate-edition pycharm-professional jetbrains-fleet" - su -c "yay --sudo \"SUDO_ASKPASS=/usr/lib/ssh/x11-ssh-askpass sudo\" --sudoflags \"-A\" --answerclean None --answerdiff None -S ${pkgs}" - tdpeuter + # Prompt for sudo password + options="--sudo \"SUDO_ASKPASS=/usr/lib/ssh/x11-ssh-askpass sudo\" " + # Skip these + options+="--sudoflags \"-A\" --answerclean None --answerdiff None " + # Install as dependency + options+="--makepkg \"makepkg --asdeps\" " + + su -c "yay ${options} -S ${pkgs}" - tdpeuter } install_fonts() {