diff options
author | JozanLeClerc <bousset.rudy@gmail.com> | 2019-11-27 16:02:58 +0100 |
---|---|---|
committer | JozanLeClerc <bousset.rudy@gmail.com> | 2019-11-27 16:02:58 +0100 |
commit | 8964649ba2e8f6f66af1958c8089338a09f4c7ef (patch) | |
tree | 3fb60ff0cf464b67fe92d050e2d86f756de2d9b7 /joes-arch-install.sh | |
parent | Dialoged root prompt (diff) | |
download | arch-installer-8964649ba2e8f6f66af1958c8089338a09f4c7ef.tar.gz arch-installer-8964649ba2e8f6f66af1958c8089338a09f4c7ef.tar.bz2 arch-installer-8964649ba2e8f6f66af1958c8089338a09f4c7ef.tar.xz arch-installer-8964649ba2e8f6f66af1958c8089338a09f4c7ef.tar.zst arch-installer-8964649ba2e8f6f66af1958c8089338a09f4c7ef.zip |
Removed useless functions
Diffstat (limited to 'joes-arch-install.sh')
-rwxr-xr-x | joes-arch-install.sh | 86 |
1 files changed, 26 insertions, 60 deletions
diff --git a/joes-arch-install.sh b/joes-arch-install.sh index 592e147..e3824dc 100755 --- a/joes-arch-install.sh +++ b/joes-arch-install.sh @@ -95,13 +95,13 @@ components to install:" 10 50 3 \ extras "Extras (Xorg, gst-plugins...)" off \ 3>&1 1>&2 2>&3 3>&-) if echo -n "$sel" | grep -q linux-lts; then - $ltskern=true + ltskern=true fi if echo -n "$sel" | grep -q utils; then - $utils=true + utils=true fi if echo -n "$sel" | grep -q extras; then - $extras=true + extras=true fi } @@ -165,14 +165,6 @@ jo_get_root_size() { done } -jo_get_continue() { - if dialog --yesno "$1" $2 $3; then - answr=true - else - answr=false - fi -} - jo_pacstrap() { echo dialog --title "$1" --infobox "Installing $1" 3 50 @@ -203,40 +195,12 @@ jo_get_options "I. CORE SETUP" #------------------------------------------ DISK SETUP --------------------------------------------# #==================================================================================================# while [[ $answr != y && $answr != Y && $answr != yes && $answr != Yes && $answr != YES ]]; do + btsze="128M" swps="" rts="" jo_get_disk "II. DISK SETUP" jo_get_swap_size "II. DISK SETUP" jo_get_root_size "II. DISK SETUP" - echo -e "${BMAGENTA}\ -#========= I. DISK SETUP =========# -# # -# Please choose wisely # -# # -# 3. root partion size # -# # -#=================================#" - while [ "$gogogo" = false ]; do - echo && echo - echo -e "${BCYAN}\ -Please enter your ${BYELLOW}root partition ${BCYAN}disired size: -__G" - echo -n -e "${BYELLOW}> " - read -r rts - if [[ $rts == "" ]]; then - echo && echo - echo -e "${BRED}Can't be empty, retrying...${END}" - gogogo=false - elif ! [[ $rts =~ $numregex ]]; then - echo && echo - echo -e "${BRED}Illegal value, please choose something reasonable. Retrying...${END}" - gogogo=false - else - gogogo=true - fi - done - gogogo=false - btsze="128M" rtsze=$rts"G" swpsze=$swps"G" clear @@ -527,32 +491,34 @@ clear #================================================================# #----------------------- UTILS DOWNLOAD -------------------------# #================================================================# -echo -e "${BMAGENTA}\ +if [ "$utils" = true ]; then + echo -e "${BMAGENTA}\ #====== IV. INSTALLING LINUX =====# # # # 5. Installing useful packages # # so you don't have to # # # #=================================#${END}" -echo -jo_pacstrap zip -jo_pacstrap unzip -jo_pacstrap p7zip -jo_pacstrap vim -jo_pacstrap mc -jo_pacstrap alsa-utils -jo_pacstrap syslog-ng -jo_pacstrap mtools -jo_pacstrap dostools -jo_pacstrap lsb-release -jo_pacstrap ntfs-3g -jo_pacstrap exfat-utils -jo_pacstrap git -jo_pacstrap ntp -jo_pacstrap cronie -echo && echo -echo -e "${BGREEN}Utils installed.${END}" -sleep 4 + echo + jo_pacstrap zip + jo_pacstrap unzip + jo_pacstrap p7zip + jo_pacstrap vim + jo_pacstrap mc + jo_pacstrap alsa-utils + jo_pacstrap syslog-ng + jo_pacstrap mtools + jo_pacstrap dostools + jo_pacstrap lsb-release + jo_pacstrap ntfs-3g + jo_pacstrap exfat-utils + jo_pacstrap git + jo_pacstrap ntp + jo_pacstrap cronie + echo && echo + echo -e "${BGREEN}Utils installed.${END}" + sleep 4 +fi #================================================================# #------------------------ EXTRA DOWNLOAD ------------------------# #================================================================# |