Skip to content

Commit

Permalink
clean up the install processx
Browse files Browse the repository at this point in the history
  • Loading branch information
SolidHal committed May 23, 2019
1 parent 0fc096e commit 9c71414
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
17 changes: 13 additions & 4 deletions scripts/InstallScripts/InstallPackages.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -118,25 +119,33 @@ 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
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
Expand Down
4 changes: 3 additions & 1 deletion scripts/buildFilesystem.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 9c71414

Please sign in to comment.