|
@@ -652,6 +652,7 @@ fi
|
652
|
652
|
|
653
|
653
|
function parse_args {
|
654
|
654
|
if [[ $NO_OF_ARGS == 0 ]]; then
|
|
655
|
+ echo 'no_of_args = 0'
|
655
|
656
|
show_help
|
656
|
657
|
exit 0
|
657
|
658
|
fi
|
|
@@ -660,11 +661,13 @@ function parse_args {
|
660
|
661
|
echo "There is no user '$MY_USERNAME' on the system. Use 'adduser $MY_USERNAME' to create the user."
|
661
|
662
|
exit 1
|
662
|
663
|
fi
|
663
|
|
- if [ ! $DOMAIN_NAME ]; then
|
|
664
|
+ if [ ! "$DOMAIN_NAME" ]; then
|
|
665
|
+ echo 'No default domain specified'
|
664
|
666
|
show_help
|
665
|
667
|
exit 2
|
666
|
668
|
fi
|
667
|
669
|
if [ ! $MY_USERNAME ]; then
|
|
670
|
+ echo 'No username specified'
|
668
|
671
|
show_help
|
669
|
672
|
exit 3
|
670
|
673
|
fi
|
|
@@ -694,6 +697,9 @@ function read_configuration {
|
694
|
697
|
fi
|
695
|
698
|
|
696
|
699
|
if [ -f $CONFIGURATION_FILE ]; then
|
|
700
|
+ if grep -q "MY_USERNAME" $CONFIGURATION_FILE; then
|
|
701
|
+ MY_USERNAME=$(grep "MY_USERNAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
|
702
|
+ fi
|
697
|
703
|
if grep -q "DOMAIN_NAME" $CONFIGURATION_FILE; then
|
698
|
704
|
DOMAIN_NAME=$(grep "DOMAIN_NAME" $CONFIGURATION_FILE | awk -F '=' '{print $2}')
|
699
|
705
|
fi
|