summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Griffin <aaronmgriffin@gmail.com>2009-01-23 18:17:00 +0100
committerAaron Griffin <aaronmgriffin@gmail.com>2009-01-23 18:17:00 +0100
commitca692c93f71dd05a25e21191e69b8f2d07d92622 (patch)
tree51a222a6f01a35cfcbe7377125af943aff6e9d7b
parent3719079643a98af53ee3a69cb578f8c26b19f2b2 (diff)
downloadmkinitcpio-0.5.23.tar.gz
mkinitcpio-0.5.23.tar.xz
Revert BASEDIR and dest changes0.5.23
These changes are potential breakers and we are not fully prepared to test them, nor are they fully usable just yet. Revert for now. Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-rw-r--r--functions11
1 files changed, 8 insertions, 3 deletions
diff --git a/functions b/functions
index 9c5f75b..1ce535c 100644
--- a/functions
+++ b/functions
@@ -172,6 +172,11 @@ add_binary ()
bin="${1}"
fi
+ dest=""
+ if [ $# -eq 2 ]; then
+ dest=${2}
+ fi
+
if [ ! -f "${bin}" ]; then
err "'${bin}' is not a file"
return 1
@@ -182,7 +187,7 @@ add_binary ()
case "${type}" in
*script*)
msg " adding '${type}' script, ensure proper interp exists..."
- add_file "${bin}"
+ add_file "${bin}" ${dest}
;;
*executable*|*shared\ object*)
add_file "${bin}" ${dest}
@@ -193,7 +198,7 @@ add_binary ()
#remove TLS libraries
notls=$(echo ${lib} | sed 's|/lib/tls.*/\(lib.*\)|/lib/\1|')
[ -e "${notls}" ] && lib="${notls}"
- [ -f "${lib}" ] && add_file "${BASEDIR}${lib}"
+ [ -f "${lib}" ] && add_file "${lib}"
fi
done
;;
@@ -216,7 +221,7 @@ parse_hook ()
for bin in ${BINARIES}; do
if [ -n "${bin}" ]; then
- add_binary "${BASEDIR}${bin}"
+ add_binary "${bin}"
fi
done