Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/applets/install.sh

Timestamp:

Dec 20, 2016, 4:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/applets/install.sh (modified) (5 diffs)

branches/3.3/mindi-busybox/applets/install.sh

@@ -6 +6 @@
 prefix=$1
 if [ -z "$prefix" ]; then
-    echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--scriptwrapper]"
+    echo "usage: applets/install.sh DESTINATION [--symlinks/--hardlinks/--binaries/--scriptwrapper]"
     exit 1
 fi
 
+# Source the configuration
+. ./.config
+
 h=`sort busybox.links | uniq`
+
+sharedlib_dir="0_lib"
 
 linkopts=""
 scriptwrapper="n"
+binaries="n"
 cleanup="0"
 noclobber="0"
@@ -19 +25 @@
     --hardlinks)     linkopts="-f";;
     --symlinks)      linkopts="-fs";;
+    --binaries)      binaries="y";;
     --scriptwrapper) scriptwrapper="y";swrapall="y";;
     --sw-sh-hard)    scriptwrapper="y";linkopts="-f";;
@@ -41 +48 @@
         rm -f "$prefix/$libdir/$i" || exit 1
         if [ -f "$i" ]; then
+            echo "   Installing $i to the target at $prefix/$libdir/"
             cp -pPR "$i" "$prefix/$libdir/" || exit 1
-            chmod 0644 "$prefix/$libdir/$i" || exit 1
+            chmod 0644 "$prefix/$libdir/`basename $i`" || exit 1
         fi
     done
@@ -69 +77 @@
 for i in $h; do
     appdir=`dirname "$i"`
+    app=`basename "$i"`
     mkdir -p "$prefix/$appdir" || exit 1
     if [ "$scriptwrapper" = "y" ]; then
@@ -79 +88 @@
         fi
         echo "  $prefix/$i"
+    elif [ "$binaries" = "y" ]; then
+        # Copy the binary over rather
+        if [ -e $sharedlib_dir/$app ]; then
+            if [ "$noclobber" = "0" ] || [ ! -e "$prefix/$i" ]; then
+                echo "   Copying $sharedlib_dir/$app to $prefix/$i"
+                cp -pPR $sharedlib_dir/$app $prefix/$i || exit 1
+            else
+                echo "  $prefix/$i already exists"
+            fi
+        else
+            echo "Error: Could not find $sharedlib_dir/$app"
+            exit 1
+        fi
     else
         if [ "$2" = "--hardlinks" ]; then