g/PrawnOS-nonfree
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

clean up the install processx

Browse Source
This commit is contained in:
Hal Emmerich 2019-05-23 16:47:16 -05:00
parent 0fc096ec64
commit 9c71414f5b
2 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
scripts/InstallScripts/InstallPackages.sh
View File

@ -57,6 +57,7 @@ then
#Copy in lightdm/light greeter settings #Copy in lightdm/light greeter settings
cp -f $DIR/icons/icon-small.png /etc/lightdm/icon.png 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/ cp -f $DIR/xfce-config/lightdm/* /etc/lightdm/
#Copy in wallpapers #Copy in wallpapers
@ -118,17 +119,25 @@ systemctl enable fstrim.timer
dmesg -D dmesg -D
echo ""
echo ""
echo ""
cat $DIR/icons/ascii-icon.txt
echo ""
echo "*************Welcome To PrawnOS*************"
echo ""
#Have the user set a root password #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 until passwd
do do
echo " Enter a password for the root user" echo "-----Enter a password for the root user-----"
passwd passwd
done done
#Force a safe username #Force a safe username
while true; do while true; do
echo " Enter new username: " echo "-----Enter new username:-----"
read username read username
#ensure no whitespace #ensure no whitespace
case $username in *\ *) echo usernames may not contain whitespace;; *) break;; esac case $username in *\ *) echo usernames may not contain whitespace;; *) break;; esac
@ -136,7 +145,7 @@ done
until adduser $username --gecos "" until adduser $username --gecos ""
do do
while true; do while true; do
echo " Enter new username: " echo "-----Enter new username:-----"
read username read username
#ensure no whitespace #ensure no whitespace
case $username in *\ *) echo usernames may not contain whitespace;; *) break;; esac case $username in *\ *) echo usernames may not contain whitespace;; *) break;; esac

4
scripts/buildFilesystem.sh
View File

@ -100,7 +100,9 @@ chroot $outmnt passwd -d root
echo -n PrawnOS-Alpha > $outmnt/etc/hostname echo -n PrawnOS-Alpha > $outmnt/etc/hostname
cp -R $install_resources/ $outmnt/InstallResources/ cp -R $install_resources/ $outmnt/InstallResources/
# and the icons for the lockscreen and app menu # 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/* $outmnt/InstallResources/
cp scripts/InstallScripts/InstallToInternal.sh $outmnt/ cp scripts/InstallScripts/InstallToInternal.sh $outmnt/
chmod +x $outmnt/*.sh chmod +x $outmnt/*.sh