master.sh, validated the extra book versions only for LFS otherwise an error
This commit is contained in:
parent
d2a9d60e49
commit
d95b8f2eb2
1 changed files with 24 additions and 23 deletions
45
master.sh
45
master.sh
|
@ -14,7 +14,7 @@ simple_error() { # Basic error trap.... JUST DIE
|
||||||
}
|
}
|
||||||
|
|
||||||
see_ya() {
|
see_ya() {
|
||||||
echo -e "\n\t${BOLD}Goodbye and thank you for choosing ${L_arrow}JHALFS${R_arrow}\n"
|
echo -e "\n\t${BOLD}Goodbye and thank you for choosing ${L_arrow}JHALFS-X${R_arrow}\n"
|
||||||
}
|
}
|
||||||
##### Simple error TRAPS
|
##### Simple error TRAPS
|
||||||
# ctrl-c SIGINT
|
# ctrl-c SIGINT
|
||||||
|
@ -120,19 +120,20 @@ while test $# -gt 0 ; do
|
||||||
dev* | SVN | trunk )
|
dev* | SVN | trunk )
|
||||||
LFSVRS=development
|
LFSVRS=development
|
||||||
;;
|
;;
|
||||||
6.1.1 )
|
*) if [[ "$PROGNAME" = "lfs" ]]; then
|
||||||
echo "For stable 6.1.1 book, please use jhalfs-0.2."
|
case $1 in
|
||||||
exit 0
|
6.1.1 )
|
||||||
;;
|
echo "For stable 6.1.1 book, please use jhalfs-0.2."
|
||||||
alpha*)
|
exit 0
|
||||||
LFSVRS=alphabetical
|
;;
|
||||||
;;
|
alpha*) LFSVRS=alphabetical ;;
|
||||||
udev*)
|
udev*) LFSVRS=udev_update ;;
|
||||||
LFSVRS=udev_update
|
* ) echo "$1 is an unsupported version at this time." ;;
|
||||||
;;
|
esac
|
||||||
* )
|
else
|
||||||
echo "$1 is an unsupported version at this time."
|
echo "This requested version, ${L_arrow} ${BOLD}$1${OFF} ${R_arrow}, is an unsupported in the ${BOLD}$(echo $PROGNAME | tr [a-z] [A-Z])${OFF} series."
|
||||||
exit 1
|
exit 0
|
||||||
|
fi
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
@ -146,7 +147,6 @@ while test $# -gt 0 ; do
|
||||||
MKFILE=$JHALFSDIR/${PROGNAME}-Makefile
|
MKFILE=$JHALFSDIR/${PROGNAME}-Makefile
|
||||||
;;
|
;;
|
||||||
|
|
||||||
--rebuild ) CLEAN=1 ;;
|
|
||||||
|
|
||||||
--download-client | -D )
|
--download-client | -D )
|
||||||
echo "The download feature is temporarily disable.."
|
echo "The download feature is temporarily disable.."
|
||||||
|
@ -160,8 +160,8 @@ while test $# -gt 0 ; do
|
||||||
test $# = 1 && eval "$exit_missing_arg"
|
test $# = 1 && eval "$exit_missing_arg"
|
||||||
shift
|
shift
|
||||||
if [ -f $1/patches.ent ] ; then
|
if [ -f $1/patches.ent ] ; then
|
||||||
WC=1
|
WC=1
|
||||||
BOOK=$1
|
BOOK=$1
|
||||||
else
|
else
|
||||||
echo -e "\nLook like $1 isn't a supported working copy."
|
echo -e "\nLook like $1 isn't a supported working copy."
|
||||||
echo -e "Verify your selection and the command line.\n"
|
echo -e "Verify your selection and the command line.\n"
|
||||||
|
@ -184,10 +184,11 @@ while test $# -gt 0 ; do
|
||||||
esac
|
esac
|
||||||
;;
|
;;
|
||||||
|
|
||||||
--get-packages | -P ) HPKG=1 ;;
|
--get-packages | -P ) HPKG=1 ;;
|
||||||
--run-make | -M ) RUNMAKE=1 ;;
|
--run-make | -M ) RUNMAKE=1 ;;
|
||||||
--no-strip ) STRIP=0 ;;
|
--no-strip ) STRIP=0 ;;
|
||||||
--no-vim-lang ) VIMLANG=0 ;;
|
--no-vim-lang ) VIMLANG=0 ;;
|
||||||
|
--rebuild ) CLEAN=1 ;;
|
||||||
|
|
||||||
--page_size )
|
--page_size )
|
||||||
test $# = 1 && eval "$exit_missing_arg"
|
test $# = 1 && eval "$exit_missing_arg"
|
||||||
|
@ -266,7 +267,7 @@ fi
|
||||||
# xxx.config
|
# xxx.config
|
||||||
# comand line
|
# comand line
|
||||||
# default
|
# default
|
||||||
# If set by conf file leave or cmd line leave it
|
# If set by conf file or cmd line leave it
|
||||||
# alone otherwise load the default version
|
# alone otherwise load the default version
|
||||||
#===================================================
|
#===================================================
|
||||||
BOOK=${BOOK:=$PROGNAME-$LFSVRS}
|
BOOK=${BOOK:=$PROGNAME-$LFSVRS}
|
||||||
|
|
Reference in a new issue