[oe-commits] [meta-openembedded] 04/66: p7zip: do not hardcode path in native wrapper script

git at git.openembedded.org git at git.openembedded.org
Mon Oct 3 17:31:19 UTC 2016


martin_jansa pushed a commit to branch master-next
in repository meta-openembedded.

commit 67d6ed40bfeb219490e509f33c27ebd2a1149d30
Author: Jonathan Liu <net147 at gmail.com>
AuthorDate: Fri Sep 23 12:39:24 2016 +1000

    p7zip: do not hardcode path in native wrapper script
    
    Signed-off-by: Jonathan Liu <net147 at gmail.com>
    Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-oe/recipes-extended/p7zip/p7zip_16.02.bb | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb
index 9f87e9f..fdd51db 100644
--- a/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb
+++ b/meta-oe/recipes-extended/p7zip/p7zip_16.02.bb
@@ -29,8 +29,10 @@ do_install_class-native() {
 
     # Create a shell script wrapper to execute next to 7z.so
     mv ${D}${bindir}/7z ${D}${bindir}/7z.bin
-    echo "#! /bin/sh" > ${D}${bindir}/7z
-    echo "exec ${D}${bindir}/7z.bin \"\$@\"" >> ${D}${bindir}/7z
+    cat > ${D}${bindir}/7z << 'EOF'
+#!/bin/sh
+exec "$(dirname "$0")"/7z.bin "$@"
+EOF
     chmod 0755 ${D}${bindir}/7z
 }
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the Openembedded-commits mailing list