Changeset 1fa0dee for common/libs/func_install_blfs

Timestamp:

01/30/2018 01:53:34 PM (6 years ago)

Author:

Pierre Labastie <pierre@…>

Branches:

ablfs-more, legacy, trunk

Children:

5afaf7c

Parents:

2140f22

Message:

Prepend JH_ to exported variables in jhalfs-blfs, so that collision with
build system variables is unlikely

File:

• common/libs/func_install_blfs (modified) (3 diffs)

common/libs/func_install_blfs

@@ -14 +14 @@
 cp README.BLFS ${BUILDDIR}${BLFS_ROOT}
 if [ "$WRAP_INSTALL" = y ]; then
-  sed -e 's/PKGDIR/UNPACKDIR/' \
-      -e 's/PKG_DEST/PKG_DIR/' \
+  sed -e 's/PKGDIR/JH_UNPACKDIR/' \
+      -e 's/PKG_DEST/JH_PKG_DIR/' \
       $PKGMNGTDIR/packInstall.sh > ${BUILDDIR}${BLFS_ROOT}/packInstall.sh
 fi
@@ -145 +145 @@
 echo -e '#!/bin/bash\nset -e\n' > $BUILDDIR$BLFS_ROOT/download_script
 sed -n -e '/PACKAGE=/,/^fi/{/^fi/a\
-cp $PACKAGE $SRC_ARCHIVE
+cp $PACKAGE $JH_SRC_ARCHIVE
 p}' \
        -e '/|[ ]*md5sum/p' \
        -e '/PACKAGE1=/,/^fi/{/^fi/a\
-cp $PACKAGE1 $SRC_ARCHIVE
+cp $PACKAGE1 $JH_SRC_ARCHIVE
 p}' \
        -e '/PATCH=/,/^fi/{/^fi/a\
-cp $PATCH $SRC_ARCHIVE
+cp $PATCH $JH_SRC_ARCHIVE
 p}' \
        -e '/URL=/,/^fi/{/^fi/a\
-cp $BOOTPACKG $SRC_ARCHIVE
+cp $BOOTPACKG $JH_SRC_ARCHIVE
 p}' \
     $BUILDDIR$BLFS_ROOT/scripts/* >> $BUILDDIR$BLFS_ROOT/download_script
@@ -165 +165 @@
 sudo find . -name unpacked -exec rm \{\} \;
 if [ "$GETPKG" = "y" ]; then
-    FTP_SERVER=$SERVER/pub/blfs/ \
-    SRC_ARCHIVE=${SRC_ARCHIVE:-/dev/null}     \
+    JH_FTP_SERVER=$SERVER/pub/blfs/ \
+    JH_SRC_ARCHIVE=${SRC_ARCHIVE:-/dev/null}     \
     $BUILDDIR$BLFS_ROOT/download_script
 else # Save the download script in case the user wants to run it later