Update pyrenee-conversion-utility.sh

pyrenee-conversion-utility.sh

@@ -53,24 +53,24 @@ dialog $BACK "$TITLE" --insecure --title "Password Provider" --passwordbox "Prov
           sed -i 's/\# //g' /etc/apk/repositories
 
 #backup original useradd config file & switch default shell from ash to bash.
-#         cp /etc/default/useradd /etc/default/useradd.bak
-#         sed -i 's/ash/bash' /etc/default/useradd
+          mkdir /etc/default
+#         touch /etc/default/useradd
+          echo -e 'SHELL=/bin/bash' > /etc/default/useradd
 #add aliases to bash to ease transition to doas & make 'rm' always interactive.
           echo -e '#! /bin/bash\n\nalias sudo="doas"\nalias rm="rm -i"' > /etc/profile.d/aliases.sh
+          mv /etc/profile.d/color_prompt.sh.disabled /etc/profile.d/color_prompt.sh
 
           adduser -D -g "$FULLNAME" $USER -s /bin/bash
           echo -e "$PASSWORD1\n$PASSWORD2" | passwd $USER
 
-          apk upgrade | dialog $BACK "$TITLE" --progressbox $SIZE2
-          setup-xorg-base | dialog $BACK "$TITLE" --progressbox $SIZE2
-          apk add doas htop nano falkon flatpak plasma kde-applications-base kde-applications-accessibility pm-utils | dialog $BACK "$TITLE" --progressbox $SIZE2
+          apk upgrade | dialog $BACK "$TITLE" --title "Upgrade the current system"--progressbox $SIZE2
+          setup-xorg-base | dialog $BACK "$TITLE" --title "Setup Xorg Base" --progressbox $SIZE2
+          apk add doas htop nano falkon flatpak plasma kde-applications-base kde-applications-accessibility pm-utils | dialog $BACK "$TITLE" "Install KDE Plasma" --progressbox $SIZE2
 #backup original doas.conf and permit group wheel and add some persistence
           cp /etc/doas.d/doas.conf /etc/doas.d/doas.conf.bak
           echo -e "permit :wheel\npermit persist :wheel" >> /etc/doas.d/doas.conf
 #add video driver for QEMU
-          apk add xf86-video-modesetting xf86-video-intel | dialog $BACK "$TITLE" --progressbox $SIZE
-#         apk add xf86-video-qxl | dialog $BACK "$TITLE" --progressbox $SIZE
-#         echo -e 'Section "Device"\n  Identifier "qxl"\n  Driver "qxl"\n  Option "ENABLE_SURFACES" "False"\nEndSection' > /etc/X11/xorg.conf
+          apk add xf86-video-modesetting xf86-video-intel | dialog $BACK "$TITLE" "Install QEMU videodrivers" --progressbox $SIZE
 #backup nanorc & change nanorc settings to be a bit more advanced
           cp /etc/nanorc /etc/nanorc.bak
           sed -i 's/# set atblanks/set atblanks/g' /etc/nanorc
@@ -97,7 +97,6 @@ dialog $BACK "$TITLE" --insecure --title "Password Provider" --passwordbox "Prov
           sed -i 's/# set numbercolor/set numbercolor/g' /etc/nanorc
           sed -i 's/# set keycolor/set keycolor/g' /etc/nanorc
           sed -i 's/# set functioncolor/set functioncolor/g' /etc/nanorc
-
           sed -i 's/# include \"\/usr\/share\/nano\/\*\.nanorc/include \"\/usr\/share\/nano\/\*\.nanorc/g' /etc/nanorc
 
 #add & enable Internet Wireless Device (iwd)
@@ -120,7 +119,6 @@ COMMENT
           touch /etc/acpi/LID/00000080
           echo -e "#!/bin/sh\n\nexec pm-suspend" >/etc/acpi/LID/00000080
           chmod +x /etc/acpi/LID/00000080
-
 #add user to relevant groups
           adduser $USER audio
           adduser $USER disk