summaryrefslogtreecommitdiff
path: root/configs/mate/root-image/root/.scriptsInstallation/language/en/install.sh
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-07-27 02:24:51 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-07-27 02:24:51 -0300
commit77a356698264eda03333993531804351ac4b512e (patch)
tree2ce5dd3a8043e99ddb6e17e9cef3fe6e5cd23770 /configs/mate/root-image/root/.scriptsInstallation/language/en/install.sh
parent57b4528f2628b991c870fea53c74b3f4dcd9b508 (diff)
Change choosing options in Mate ISO installer
Diffstat (limited to 'configs/mate/root-image/root/.scriptsInstallation/language/en/install.sh')
-rwxr-xr-xconfigs/mate/root-image/root/.scriptsInstallation/language/en/install.sh36
1 files changed, 17 insertions, 19 deletions
diff --git a/configs/mate/root-image/root/.scriptsInstallation/language/en/install.sh b/configs/mate/root-image/root/.scriptsInstallation/language/en/install.sh
index 9ca0c60..592e86e 100755
--- a/configs/mate/root-image/root/.scriptsInstallation/language/en/install.sh
+++ b/configs/mate/root-image/root/.scriptsInstallation/language/en/install.sh
@@ -98,8 +98,8 @@ while [ option != 7 ]; do
2 "Install Base System" \
3 "Install GRUB" \
4 "System Configure" \
- 5 "Create User Account" \
- 6 "(Optional) Install Live DVD Desktop/Applications" \
+ 5 "(Optional) Install Live DVD Desktop/Applications" \
+ 6 "Create User Account" \
7 "Exit" )
case $option in
@@ -126,21 +126,7 @@ while [ option != 7 ]; do
arch-chroot /mnt /systemConfig.sh
rm -r /mnt/systemConfig.sh
;;
- 5)
- #Create a new username and save in temporal, to use after
- if (cat ~/.scriptsInstallation/temporal | grep "userName=") &>/dev/null
- then
- sed -i -e '/userName=*/d' ~/.scriptsInstallation/temporal
- fi
-
- echo "userName=$(dialog --stdout --inputbox "Enter an User Name" 8 40)" >> ~/.scriptsInstallation/temporal
- cp ~/.scriptsInstallation/temporal /mnt
- cp ~/.scriptsInstallation/userAccount.sh /mnt
- chmod +x /mnt/userAccount.sh
- arch-chroot /mnt /userAccount.sh
- rm -r /mnt/userAccount.sh
- ;;
- 6)
+ 5)
#Packages to the X11 live
packages=( "xorg-server"
"xf86-input-evdev"
@@ -231,8 +217,6 @@ while [ option != 7 ]; do
#Puts the XKBMAP, start X11 automatically and Mate desktop
echo "setxkbmap $(cat ~/.codecheck | grep XKBMAP= | cut -d '=' -f 2)" > /mnt/etc/skel/.xinitrc
- echo "exec mate-session" >> /mnt/etc/skel/.xinitrc
- echo "startx" >> /mnt/etc/skel/.bash_profile
chmod +x /mnt/etc/skel/.xinitrc
cp -a ~/.scriptsInstallation/x11.sh /mnt
@@ -241,6 +225,20 @@ while [ option != 7 ]; do
arch-chroot /mnt /x11.sh
rm /mnt/x11.sh
;;
+ 6)
+ #Create a new username and save in temporal, to use after
+ if (cat ~/.scriptsInstallation/temporal | grep "userName=") &>/dev/null
+ then
+ sed -i -e '/userName=*/d' ~/.scriptsInstallation/temporal
+ fi
+
+ echo "userName=$(dialog --stdout --inputbox "Enter an User Name" 8 40)" >> ~/.scriptsInstallation/temporal
+ cp ~/.scriptsInstallation/temporal /mnt
+ cp ~/.scriptsInstallation/userAccount.sh /mnt
+ chmod +x /mnt/userAccount.sh
+ arch-chroot /mnt /userAccount.sh
+ rm -r /mnt/userAccount.sh
+ ;;
*)
#Delete temporal file and umount partitions
rm -r /mnt/temporal