diff --git a/ADconnection.sh b/ADconnection.sh index 3a8bed2..ce09364 100755 --- a/ADconnection.sh +++ b/ADconnection.sh @@ -929,6 +929,8 @@ else sudo echo "${INTRO_TEXT}Realm=$DOMAIN${END}" echo "${INTRO_TEXT}Joining Ubuntu $var${END}" echo "" +if [ -z readfile ] +then admin=$( sudo grep ADADMIN readfile | awk '{print $3}' ) if [ "$admin" = "null" ] then @@ -938,6 +940,10 @@ read -r ADMIN else ADMIN=$( echo $admin ) fi +else +echo "${INTRO_TEXT}Please type Admin user:${END}" +read -r ADMIN +fi encrypt=$( sudo grep ENCRYPTEDPASSWD readfile | awk '{print $3}' ) if [ "$encrypt" = "null" ] || [ "$encrypt" = "no" ] then @@ -1000,6 +1006,8 @@ clear sudo echo "${INTRO_TEXT}Realm=$DOMAIN${END}" echo "${INTRO_TEXT}Joining Ubuntu $var${END}" echo "" +if [ -z readfile ] +then admin=$( sudo grep ADADMIN readfile | awk '{print $3}' ) if [ "$admin" = "null" ] then @@ -1009,6 +1017,10 @@ read -r ADMIN else ADMIN=$( echo $admin ) fi +else +echo "${INTRO_TEXT}Please type Admin user:${END}" +read -r ADMIN +fi encrypt=$( sudo grep ENCRYPTEDPASSWD readfile | awk '{print $3}' ) if [ "$encrypt" = "null" ] || [ "$encrypt" = "no" ] then @@ -1335,6 +1347,8 @@ echo "Using Domain: $DOMAIN" fi NetBios=$(echo "$DOMAIN" | cut -d '.' -f1) echo "" +if [ -z readfile ] +then admin=$( sudo grep ADADMIN readfile | awk '{print $3}' ) if [ "$admin" = "null" ] then @@ -1344,6 +1358,10 @@ read -r ADMIN else ADMIN=$( echo $admin ) fi +else +echo "${INTRO_TEXT}Please type Admin user:${END}" +read -r ADMIN +fi clear sudo echo "${INTRO_TEXT}Realm= $DOMAIN${END}" sudo echo "${NORMAL}${NORMAL}" @@ -1422,6 +1440,8 @@ echo "Using Domain: $DOMAIN" fi NetBios=$(echo "$DOMAIN" | cut -d '.' -f1) echo "" +if [ -z readfile ] +then admin=$( sudo grep ADADMIN readfile | awk '{print $3}' ) if [ "$admin" = "null" ] then @@ -1431,6 +1451,10 @@ read -r ADMIN else ADMIN=$( echo $admin ) fi +else +echo "${INTRO_TEXT}Please type Admin user:${END}" +read -r ADMIN +fi clear sudo echo "${INTRO_TEXT}Realm= $DOMAIN${END}" sudo echo "${NORMAL}${NORMAL}" @@ -1458,16 +1482,22 @@ clear echo "I searched for an available domain and found $DOMAIN but it is not responding to ping, please type your domain manually below... " echo "Please enter the domain you wish to join:" read -r DOMAIN +if [ -z readfile ] +then admin=$( sudo grep ADADMIN readfile | awk '{print $3}' ) if [ "$admin" = "null" ] then -echo "Please log in with domain admin to $DOMAIN to connect" -echo "Please type Admin user:" +echo "${INTRO_TEXT}Please log in with domain admin to $DOMAIN to connect${END}" +echo "${INTRO_TEXT}Please type Admin user:${END}" read -r ADMIN else ADMIN=$( echo $admin ) fi else +echo "${INTRO_TEXT}Please type Admin user:${END}" +read -r ADMIN +fi +else clear echo "I searched for an available domain and found >>> $DOMAIN <<<" read -r -p "Do you wish to use it (y/n)?" yn @@ -1478,6 +1508,8 @@ read -r -p "Do you wish to use it (y/n)?" yn ;; [Nn]* ) echo "Please enter the domain you wish to join:" read -r DOMAIN +if [ -z readfile ] +then admin=$( sudo grep ADADMIN readfile | awk '{print $3}' ) if [ "$admin" = "null" ] then @@ -1486,6 +1518,10 @@ echo "${INTRO_TEXT}Please type Admin user:${END}" read -r ADMIN else ADMIN=$( echo $admin ) +fi +else +echo "${INTRO_TEXT}Please type Admin user:${END}" +read -r ADMIN fi ;; * ) echo 'Please answer yes or no.';; @@ -1496,15 +1532,21 @@ clear echo "I searched for an available domain and found nothing, please type your domain manually below... " echo "Please enter the domain you wish to join:" read -r DOMAIN +if [ -z readfile ] +then admin=$( sudo grep ADADMIN readfile | awk '{print $3}' ) if [ "$admin" = "null" ] then -echo "Please log in with domain admin to $DOMAIN to connect" -echo "Please type Admin user:" +echo "${INTRO_TEXT}Please log in with domain admin to $DOMAIN to connect${END}" +echo "${INTRO_TEXT}Please type Admin user:${END}" read -r ADMIN else ADMIN=$( echo $admin ) fi +else +echo "${INTRO_TEXT}Please type Admin user:${END}" +read -r ADMIN +fi fi sudo echo "Realm= $DOMAIN" sudo echo "" @@ -1578,6 +1620,8 @@ clear echo "I searched for an available domain and found nothing, please type your domain manually below... " echo "Please enter the domain you wish to join:" read -r DOMAIN +if [ -z readfile ] +then admin=$( sudo grep ADADMIN readfile | awk '{print $3}' ) if [ "$admin" = "null" ] then @@ -1588,6 +1632,10 @@ else ADMIN=$( echo $admin ) fi else +echo "${INTRO_TEXT}Please type Admin user:${END}" +read -r ADMIN +fi +else clear echo "I searched for an available domain and found >>> $DOMAIN <<<" read -r -p "Do you wish to use it (y/n)?" yn @@ -1600,6 +1648,8 @@ read -r -p "Do you wish to use it (y/n)?" yn esac fi clear +if [ -z readfile ] +then admin=$( sudo grep ADADMIN readfile | awk '{print $3}' ) if [ "$admin" = "null" ] then @@ -1609,6 +1659,10 @@ read -r ADMIN else ADMIN=$( echo $admin ) fi +else +echo "${INTRO_TEXT}Please type Admin user:${END}" +read -r ADMIN +fi sudo echo "Realm= $DOMAIN" sudo echo "" if ! sudo realm join -v -U "$ADMIN" "$DOMAIN" --install=/ @@ -1656,6 +1710,8 @@ echo "Using Domain: $DOMAIN" #DOMAIN=$(echo "$REALM") fi clear +if [ -z readfile ] +then admin=$( sudo grep ADADMIN readfile | awk '{print $3}' ) if [ "$admin" = "null" ] then @@ -1665,6 +1721,10 @@ read -r ADMIN else ADMIN=$( echo $admin ) fi +else +echo "${INTRO_TEXT}Please type Admin user:${END}" +read -r ADMIN +fi NetBios=$(echo "$DOMAIN" | cut -d '.' -f1) clear if ! sudo realm join --verbose --user="$ADMIN" "$DOMAIN" @@ -1719,6 +1779,8 @@ echo "Using Domain: $DOMAIN" #DOMAIN=$(echo "$REALM") fi clear +if [ -z readfile ] +then admin=$( sudo grep ADADMIN readfile | awk '{print $3}' ) if [ "$admin" = "null" ] then @@ -1728,6 +1790,10 @@ read -r ADMIN else ADMIN=$( echo $admin ) fi +else +echo "${INTRO_TEXT}Please type Admin user:${END}" +read -r ADMIN +fi NetBios=$(echo "$DOMAIN" | cut -d '.' -f1) clear if ! sudo realm join --verbose --user="$ADMIN" "$DOMAIN"