Changeset 14bcaee for common/libs

Timestamp:

03/20/2017 02:12:25 PM (8 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

new_features

Children:

89b7cce

Parents:

76cf25f

Message:

Merge trunk r3926-27

Location:

common/libs

Files:

• func_install_blfs (modified) (1 diff)
• func_validate_configs.sh (modified) (2 diffs)

common/libs/func_install_blfs

@@ -193 +193 @@
         -i $BUILDDIR$BLFS_ROOT/scripts/*lynx
   fi
-fi
-# The  book instructions for CA certificates suppose that the cerdata.txt
-# file is in the same directory as make-ca.sh-<version>. This is not the
-# case with our default instructions. Just remove the "cd $UNPACKDIR" here.
-if test -f $BUILDDIR$BLFS_ROOT/scripts/*cacerts; then
-  sed -i '/cd \$UNPACKDIR/d' $BUILDDIR$BLFS_ROOT/scripts/*cacerts
 fi
 # At last generates the build Makefile

common/libs/func_validate_configs.sh

@@ -80 +80 @@
     echo -e "`eval echo ${ERROR_MSG_pt1}`" >&2
     echo -e "`eval echo ${ERROR_MSG_pt2}`" >&2
+    echo -e "${DD_BORDER}\n"
+    exit 1
+  }
+
+# This function is only used when testing package management files.
+  write_pkg_and_die() {
+    echo -e "\n${DD_BORDER}"
+    echo    "Package management is requested but" >&2
+    echo -e $* >&2
     echo -e "${DD_BORDER}\n"
     exit 1
@@ -193 +202 @@
                  ;;
 
+        # Case of PKGMNGT: two files, packageManager.xml and packInstall.sh
+        # must exist in $PKGMNGTDIR:
+      PKGMNGT) echo -e "`eval echo $PARAM_VALS`"
+               if [ ! -e "$PKGMNGTDIR/packageManager.xml" ]; then
+                 write_pkg_and_die $PKGMNGTDIR/packageManager.xml does not exist
+               fi
+               if [ ! -e "$PKGMNGTDIR/packInstall.sh" ]; then
+                 write_pkg_and_die $PKGMNGTDIR/packInstall.sh does not exist
+               fi
+               if [ ! -s "$PKGMNGTDIR/packageManager.xml" ]; then
+                 write_pkg_and_die $PKGMNGTDIR/packageManager.xml has zero size
+               fi
+               if [ ! -s "$PKGMNGTDIR/packInstall.sh" ]; then
+                 write_pkg_and_die $PKGMNGTDIR/packInstall.sh has zero size
+               fi
+               if [ ! -r "$PKGMNGTDIR/packageManager.xml" ]; then
+                 write_pkg_and_die $PKGMNGTDIR/packageManager.xml is not readable
+               fi
+               if [ ! -r "$PKGMNGTDIR/packInstall.sh" ]; then
+                 write_pkg_and_die $PKGMNGTDIR/packInstall.sh is not readable
+               fi
+               ;;
       # Display non-validated envars found in ${PROGNAME}_PARAM_LIST
       * ) echo -e "`eval echo $PARAM_VALS`" ;;