diff --git a/scripts/InstallScripts/InstallPackages.sh b/scripts/InstallScripts/InstallPackages.sh index 6d5d1be..3438354 100755 --- a/scripts/InstallScripts/InstallPackages.sh +++ b/scripts/InstallScripts/InstallPackages.sh @@ -57,6 +57,7 @@ then #Copy in lightdm/light greeter settings cp -f $DIR/icons/icon-small.png /etc/lightdm/icon.png + chmod 644 /etc/lightdm/icon.png cp -f $DIR/xfce-config/lightdm/* /etc/lightdm/ #Copy in wallpapers @@ -118,17 +119,25 @@ systemctl enable fstrim.timer dmesg -D +echo "" +echo "" +echo "" + +cat $DIR/icons/ascii-icon.txt +echo "" +echo "*************Welcome To PrawnOS*************" +echo "" #Have the user set a root password -echo " Enter a password for the root user" +echo "-----Enter a password for the root user-----" until passwd do - echo " Enter a password for the root user" + echo "-----Enter a password for the root user-----" passwd done #Force a safe username while true; do - echo " Enter new username: " + echo "-----Enter new username:-----" read username #ensure no whitespace case $username in *\ *) echo usernames may not contain whitespace;; *) break;; esac @@ -136,7 +145,7 @@ done until adduser $username --gecos "" do while true; do - echo " Enter new username: " + echo "-----Enter new username:-----" read username #ensure no whitespace case $username in *\ *) echo usernames may not contain whitespace;; *) break;; esac diff --git a/scripts/buildFilesystem.sh b/scripts/buildFilesystem.sh index 59da871..6962ade 100755 --- a/scripts/buildFilesystem.sh +++ b/scripts/buildFilesystem.sh @@ -100,7 +100,9 @@ chroot $outmnt passwd -d root echo -n PrawnOS-Alpha > $outmnt/etc/hostname cp -R $install_resources/ $outmnt/InstallResources/ # and the icons for the lockscreen and app menu -cp -R $build_resources/logo/icons/ $outmnt/InstallResources/ +mkdir $outmnt/InstallResources/icons/ +cp $build_resources/logo/icons/icon-small.png $outmnt/InstallResources/icons/ +cp $build_resources/logo/icons/ascii/* $outmnt/InstallResources/icons/ cp scripts/InstallScripts/* $outmnt/InstallResources/ cp scripts/InstallScripts/InstallToInternal.sh $outmnt/ chmod +x $outmnt/*.sh