packageupdate
This commit is contained in:
parent
ffa679b913
commit
036f45d2e4
3 changed files with 12 additions and 7 deletions
|
@ -23,6 +23,7 @@ version="$1"
|
||||||
username="$2"
|
username="$2"
|
||||||
userpass="$3"
|
userpass="$3"
|
||||||
skip="$4"
|
skip="$4"
|
||||||
|
packageupdate="$5"
|
||||||
|
|
||||||
hostname="$(cat /etc/hostname)"
|
hostname="$(cat /etc/hostname)"
|
||||||
[[ -z "${version}" ]] && version="${hostname#*-}"
|
[[ -z "${version}" ]] && version="${hostname#*-}"
|
||||||
|
@ -340,7 +341,7 @@ if [ -f /var/lib/pacman/db.lck ];then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# vollinstallation
|
# vollinstallation
|
||||||
if [ "$version" != "lite" ]; then
|
if [ "$version" != "lite" ] && [ "$packageupdate" != "skip" ]; then
|
||||||
standartinstallation
|
standartinstallation
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
@ -559,7 +560,7 @@ chmod +x /usr/bin/aurupdater
|
||||||
setcap cap_net_raw+ep /bin/ping
|
setcap cap_net_raw+ep /bin/ping
|
||||||
|
|
||||||
su "$username" -c "aurinstaller "https://aur.archlinux.org/pamac-aur.git""
|
su "$username" -c "aurinstaller "https://aur.archlinux.org/pamac-aur.git""
|
||||||
if [ "$version" != "pi" ]; then
|
if [ "$version" != "pi" ] && [ "$packageupdate" != "skip" ]; then
|
||||||
su "$username" -c "aurinstaller "https://aur.archlinux.org/plymouth.git""
|
su "$username" -c "aurinstaller "https://aur.archlinux.org/plymouth.git""
|
||||||
su "$username" -c "aurinstaller "https://aur.archlinux.org/plymouth-theme-dark-arch.git""
|
su "$username" -c "aurinstaller "https://aur.archlinux.org/plymouth-theme-dark-arch.git""
|
||||||
plymouth-set-default-theme -R dark-arch
|
plymouth-set-default-theme -R dark-arch
|
||||||
|
@ -764,7 +765,7 @@ if [ "$version" != "lite" ] && [ "$skip" != "skip" ]; then
|
||||||
cp /opt/${repo}/*.jpg /usr/share/backgrounds/xfce/
|
cp /opt/${repo}/*.jpg /usr/share/backgrounds/xfce/
|
||||||
chmod 755 -Rv /usr/share/backgrounds/xfce/
|
chmod 755 -Rv /usr/share/backgrounds/xfce/
|
||||||
|
|
||||||
if [ "$version" != "pi" ]; then
|
if [ "$version" != "pi" ] && [ "$packageupdate" != "skip" ]; then
|
||||||
# zusatzsoftware
|
# zusatzsoftware
|
||||||
su "$username" -c "aurinstaller "https://aur.archlinux.org/google-chrome.git""
|
su "$username" -c "aurinstaller "https://aur.archlinux.org/google-chrome.git""
|
||||||
su "$username" -c "aurinstaller spotify"
|
su "$username" -c "aurinstaller spotify"
|
||||||
|
@ -798,7 +799,10 @@ if pacman -Qdtq; then
|
||||||
else
|
else
|
||||||
echo "Es müssen keine verwaisten Packete entfernt werden :)"
|
echo "Es müssen keine verwaisten Packete entfernt werden :)"
|
||||||
fi
|
fi
|
||||||
pacman -Syu --needed --noconfirm
|
|
||||||
|
if [ "$packageupdate" != "skip" ]; then
|
||||||
|
pacman -Syu --needed --noconfirm
|
||||||
|
fi
|
||||||
|
|
||||||
if [ "${version}" == "libre" ]; then
|
if [ "${version}" == "libre" ]; then
|
||||||
mkinitcpio -p linux-libre
|
mkinitcpio -p linux-libre
|
||||||
|
|
|
@ -21,11 +21,12 @@ if [ "make" == "$1" ]; then
|
||||||
rm ${archiv}.tar
|
rm ${archiv}.tar
|
||||||
elif [ "restore" == "$1" ]; then
|
elif [ "restore" == "$1" ]; then
|
||||||
|
|
||||||
[[ -z "${3}" ]] && ort="."
|
pfad=$3
|
||||||
|
[[ -z "${pfad}" ]] && pfad="."
|
||||||
|
|
||||||
pixz -d ${archiv} ${archiv/.pxz*}
|
pixz -d ${archiv} ${archiv/.pxz*}
|
||||||
|
|
||||||
tar -xf ${archiv/.pxz*} -C ${ort}
|
tar -xf ${archiv/.pxz*} -C ${pfad}
|
||||||
|
|
||||||
# säuberung
|
# säuberung
|
||||||
rm ${archiv/.pxz*}
|
rm ${archiv/.pxz*}
|
||||||
|
|
|
@ -46,7 +46,7 @@ then
|
||||||
echo "Git is not installet"
|
echo "Git is not installet"
|
||||||
pacman -S git --needed --noconfirm
|
pacman -S git --needed --noconfirm
|
||||||
fi
|
fi
|
||||||
/opt/${repo}/arch-graphical-install-auto "${version}" "$2" "$3" "skip"
|
/opt/${repo}/arch-graphical-install-auto "${version}" "$2" "$3" "skip" "$4"
|
||||||
read -p "Aktualisierung erfolgreich Abgeschlossen. Wollen sie den PC NEUSTARTEN?: [Y/n] " sicherheitsabfrage
|
read -p "Aktualisierung erfolgreich Abgeschlossen. Wollen sie den PC NEUSTARTEN?: [Y/n] " sicherheitsabfrage
|
||||||
if [ "$sicherheitsabfrage" != "n" ]
|
if [ "$sicherheitsabfrage" != "n" ]
|
||||||
then
|
then
|
||||||
|
|
Loading…
Reference in a new issue