From c95598108d69ca79cd8a61122781b6e805d7f8cb Mon Sep 17 00:00:00 2001 From: Augusto Gunsch Date: Fri, 21 Oct 2022 17:32:45 +0200 Subject: [PATCH] Fix AUR command --- awesome/user_configuration.json | 8 ++++---- install.sh | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/awesome/user_configuration.json b/awesome/user_configuration.json index 6f7b16f..6587dac 100644 --- a/awesome/user_configuration.json +++ b/awesome/user_configuration.json @@ -108,10 +108,10 @@ "sudo -u root sh -c 'mkdir $HOME/repos; cd $HOME/repos; git clone https://git.augustogunsch.com/augusto/dotfiles; cd dotfiles; ./install.sh'", "sed -i 's/export PROMPT=.*$/export PROMPT='\"'\"'%B%F{63}[%F{68}%n@%m %F{white}%~%F{63}]$%b%f '\"'\"'/' /root/.zshrc", "chsh -s /usr/bin/zsh root; chsh -s /usr/bin/zsh augusto", - "sudo -u augusto sh -c 'mkdir /tmp/aur; cd /tmp/aur; git clone https://aur.archlinux.org/yay.git; cd yay; makepkg'", - "sudo -u augusto sh -c 'cd /tmp/aur; git clone https://aur.archlinux.org/gtk-theme-material-black.git; cd gtk-theme-material-black; makepkg'", - "sudo -u augusto sh -c 'cd /tmp/aur; git clone https://aur.archlinux.org/arc-icon-theme.git; cd arc-icon-theme; makepkg'", - "pacman -U --noconfirm /tmp/aur/**/*.pkg.tar.zst; rm -rf /tmp/aur", + "sudo -u augusto sh -c 'mkdir $HOME/aur; cd $HOME/aur; git clone https://aur.archlinux.org/yay.git; cd yay; makepkg'", + "sudo -u augusto sh -c 'cd $HOME/aur; git clone https://aur.archlinux.org/gtk-theme-material-black.git; cd gtk-theme-material-black; makepkg'", + "sudo -u augusto sh -c 'cd $HOME/aur; git clone https://aur.archlinux.org/arc-icon-theme.git; cd arc-icon-theme; makepkg'", + "pacman -U --noconfirm /home/augusto/aur/**/*.pkg.tar.zst; rm -rf /home/augusto/aur", "sudo -u augusto sh -c 'cd $HOME/.config/awesome; git clone https://github.com/stretturtle/awesome-wm-widgets'", "systemctl enable lightdm" ] diff --git a/install.sh b/install.sh index 69c93ae..8d50694 100755 --- a/install.sh +++ b/install.sh @@ -1,4 +1,5 @@ #!/bin/sh +set -e cd "$(dirname "$0")" [ -z "$1" ] && echo 'usage: ./install ' && exit 1 @@ -10,6 +11,9 @@ else exit 1 fi +echo 'Remember to add a password for root and the user!' +read DUMMY + archinstall \ --config user_configuration.json \ --disk-layout user_disk_layout.json \