Changeset 6e31ef7

Timestamp:

10/12/2005 10:07:29 AM (19 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

0.2, 1.0, 2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

2a54650

Parents:

f0f60d0

Message:

Added some command-line sanity checks.
Started support for timezone setting.

File:

• jhalfs (modified) (9 diffs)

jhalfs

@@ -38 +38 @@
                                 disables also the build of TCL, Expect
                                 and DejaGNU
-
-  --page_size PAGE              set PAGE as the default page size (letter,
-                                A4, or others). This setting is required to
+                                
+  --timezone TIMEZONE           set TIMEZONE as the local timezone. If not 
+                                specified, Europe/London will be used.
+
+  --page_size PAGE              set PAGE as the default page size (letter
+                                or A4). This setting is required to
                                 build Groff. If not specified, \"letter\"
                                 will be used.
@@ -108 +111 @@
       test $# = 1 && eval "$exit_missing_arg"
       shift
+      if [ -f $1/patches.ent ] ; then
       WC=1
       BOOK=$1
+      else
+        echo -e "\nLook like $1 isn't a supported working copy."
+        echo -e "Verify your selection and the command line.\n"
+        exit 1
+      fi
       shift
       ;;
@@ -131 +140 @@
       test $# = 1 && eval "$exit_missing_arg"
       shift
-      PAGE=$1
+      case $1 in
+        letter | A4 )
+          PAGE=$1
+          ;;
+        * )
+          echo "$1 isn't a supported page size."
+          exit 1
+          ;;
+      esac
       shift
       ;;
@@ -137 +154 @@
     --no-toolchain-test )
       TOOLCHAINTEST=0
+      shift
+      ;;
+
+    --timezone | -C )
+      test $# = 1 && eval "$exit_missing_arg"
+      shift
+      if [ -f /usr/share/zoneinfo/$1 ] ; then
+        TIMEZONE=$1
+      else
+        echo -e "\nLook like $1 isn't a valid timezone description."
+        echo -e "Verify your selection and the command line.\n"
+        exit 1
+      fi
       shift
       ;;
@@ -146 +176 @@
         CONFIG=$1
       else
-        echo -e "\nFile $1 not found, Skipping kernel build.\n"
+        echo -e "\nFile $1 not found. Verify your command line.\n"
+        exit 1
       fi
       shift
@@ -189 +220 @@
 if [ -z $TOOLCHAINTEST ] ; then TOOLCHAINTEST=1 ; fi
 if [ -z $PAGE ] ; then PAGE=letter ; fi
+if [ -z $TIMEZONE ] ; then TIMEZONE=Europe/London ; fi
 
 HEADER="# This file is automatically generated by jhalfs
@@ -822 +854 @@
         echo "PATH=/tools/bin:/bin:/usr/bin" >> /home/lfs/.bashrc && \\
         echo "export LFS LC_ALL PATH" >> /home/lfs/.bashrc && \\
-        echo ". $JHALFSDIR/envars" >> /home/lfs/.bashrc && \\
+        echo "source $JHALFSDIR/envars" >> /home/lfs/.bashrc && \\
         chown lfs:lfs /home/lfs/.bash* && \\
         touch envars && \\
@@ -848 +880 @@
 
 if [ ! -d $JHALFSDIR ] ; then
-  mkdir -p $JHALFSDIR
+  mkdir -pv $JHALFSDIR
 fi
 
 if [ ! -d $LOGDIR ] ; then
-  mkdir $LOGDIR
+  mkdir -v $LOGDIR
 fi
 
@@ -858 +890 @@
 
 if [ "$PWD" != "$JHALFSDIR" ] ; then
-  cp $0 $XSL $FNC $JHALFSDIR/
+  cp -v $0 $XSL $FNC $JHALFSDIR/
 fi