Develop to master #3

Merged
maximstewart merged 18 commits from develop into master 2020-05-02 11:14:56 +00:00
3 changed files with 25 additions and 25 deletions
Showing only changes of commit 6f1337c4c3 - Show all commits

View File

@ -20,19 +20,19 @@ function main() {
read -p "--> : " ANSR read -p "--> : " ANSR
done done
case $ANSR in case $ANSR in
"1" ) run_once_process; break;; "1" ) run_once_process;;
"2" ) ./GET_PPA_REPOSITORIES.sh; break;; "2" ) ./GET_PPA_REPOSITORIES.sh;;
"3" ) ./GET_PPA_GPG_KEYS.sh; break;; "3" ) ./GET_PPA_GPG_KEYS.sh;;
"4" ) get_live_iso_dependencies; break;; "4" ) get_live_iso_dependencies;;
"5" ) base; break;; "5" ) base;;
"6" ) gaming; break;; "6" ) gaming;;
"7" ) media; break;; "7" ) media;;
"8" ) office; break;; "8" ) office;;
"9" ) debs; break;; "9" ) debs;;
"10" ) transfer_settings; break;; "10" ) transfer_settings;;
"11" ) ./CLEANUP.sh; break;; "11" ) ./CLEANUP.sh;;
"0" ) exit; break;; "0" ) exit;;
* ) echo "Don't know how you got here but that's a bad sign..."; break;; * ) echo "Don't know how you got here but that's a bad sign...";;
esac esac
} }

View File

@ -20,19 +20,19 @@ function main() {
read -p "--> : " ANSR read -p "--> : " ANSR
done done
case $ANSR in case $ANSR in
"1" ) do_all_run; break;; "1" ) do_all_run;;
# First setup the debootstrap env... # First setup the debootstrap env...
"2" ) ./step_1_debootstrap.sh; break;; "2" ) ./step_1_debootstrap.sh;;
# Then setup and run chroot... # Then setup and run chroot...
"3" ) ./step_2_chroot.sh; break;; "3" ) ./step_2_chroot.sh;;
# Create the boot structure data... # Create the boot structure data...
"4" ) ./step_3_create_boot_structure.sh; break;; "4" ) ./step_3_create_boot_structure.sh;;
# Create the CD... # Create the CD...
"5" ) ./step_4_create_CD.sh; break;; "5" ) ./step_4_create_CD.sh;;
# Purge everythin and start fresh... # Purge everythin and start fresh...
"6" ) ./cleanup.sh; break;; "6" ) ./cleanup.sh;;
"0" ) exit; break;; "0" ) exit;;
* ) echo "Don't know how you got here but that's a bad sign..."; break;; * ) echo "Don't know how you got here but that's a bad sign...";;
esac esac
} }

View File

@ -12,15 +12,15 @@ function main() {
move_iso_linux_parts; move_iso_linux_parts;
echo "\nWhich boot style do you want to use?" echo "\nWhich boot style do you want to use?"
echo "\t 1) Text Boot" echo "\t1) Text Boot"
echo "\t 2) GUI Boot" echo "\t2) GUI Boot"
read -p "--> : " ANSR read -p "--> : " ANSR
while [[ $ANSR != "1" ]] && [[ $ANSR != "2" ]]; do while [[ $ANSR != "1" ]] && [[ $ANSR != "2" ]]; do
read -p "--> : " ANSR read -p "--> : " ANSR
done done
case $ANSR in case $ANSR in
"1" ) isolinux_text_boot; break;; "1" ) isolinux_text_boot;;
"2" ) isolinux_gui_boot; break;; "2" ) isolinux_gui_boot;;
esac esac
echo "Creating manifest..." echo "Creating manifest..."