diff --git a/arch-graphical-install-auto b/arch-graphical-install-auto index 1bc64f5..9515833 100755 --- a/arch-graphical-install-auto +++ b/arch-graphical-install-auto @@ -126,7 +126,6 @@ function aurmanagerinstall() { pwd su "$username" -c "makepkg -si --skipchecksums --skippgpcheck --nocheck --noconfirm --install --needed" pwd - rm -Rv /home/"$username"/aurman cd / } @@ -525,6 +524,13 @@ chsh -s /usr/bin/fish ${username} # XDG standard cp /opt/${repo}/mimeapps.list /etc/xdg/mimeapps.list +# aurinstaller +cp /opt/${repo}/aurinstall.sh /usr/bin/aurinstaller +chmod +x /usr/bin/aurinstaller + +aurinstaller "https://aur.archlinux.org/plymouth.git" +aurinstaller "https://aur.archlinux.org/plymouth-theme-dark-arch.git" + # nano echo "include "/usr/share/nano/*.nanorc"" > /etc/nanorc @@ -575,9 +581,9 @@ fi if [ "$version" != "lite" ]; then - # custom-installer + ### custom-installer - # pip install beautysh + ## pip install beautysh if [ -d /opt/beautysh ];then echo "Bereits vorhanden!!!" cd /opt/beautysh @@ -597,7 +603,7 @@ if [ "$version" != "lite" ]; then pip install powerline-shell - # powerline-shell-fonts + ## powerline-shell-fonts if [ -d /opt/powerline-shell-fonts ];then echo "Bereits vorhanden!!!" cd /opt/powerline-shell-fonts @@ -609,7 +615,7 @@ if [ "$version" != "lite" ]; then ./install.sh cd / - # uncrustify + ## uncrustify if [ -d /opt/uncrustify ];then echo "Bereits vorhanden!!!" cd /opt/uncrustify @@ -630,7 +636,7 @@ if [ "$version" != "lite" ]; then chmod +x /usr/bin/uncrustify cd / - # conky + ## conky if [ -d /opt/conky ];then echo "Bereits vorhanden!!!" cd /opt/conky diff --git a/arch-install b/arch-install index cbc2c38..cb28482 100755 --- a/arch-install +++ b/arch-install @@ -290,12 +290,10 @@ function installation { parameter="${parameter}usbsecret " fi - if [ "${version}" != "libre" ]; then - if [ "${verschluesselung}" == "y" ]; then - parameter="${parameter}plymouth-encrypt " - else - parameter="${parameter}plymouth " - fi + if [ "${verschluesselung}" == "y" ]; then + parameter="${parameter}plymouth-encrypt " + else + parameter="${parameter}plymouth " fi diff --git a/aurinstall.sh b/aurinstall.sh new file mode 100755 index 0000000..9e060e9 --- /dev/null +++ b/aurinstall.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +set -ex + +url="$1" +url1=${url%.*} +url2=${url1#*//} +packagename=${url2#*/} + +cd +pwd +if [ -d ${packagename} ];then + echo "Bereits vorhanden!!!" + cd ${packagename} + git pull +else + git clone ${url} + cd ${packagename} +fi +makepkg -si --skipchecksums --skippgpcheck --nocheck --noconfirm --install --needed +