diff options
| author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-01-25 12:48:43 +0100 |
|---|---|---|
| committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2021-01-29 14:30:32 +0100 |
| commit | 396a35dd51f1d58c051d0c1f1100e44950933d3b (patch) | |
| tree | 8132a2fec84e13f55843233020780a92abeaefa8 | |
| parent | 331892f85f1cfab21b26a1f84824f4110e06027f (diff) | |
| download | upstream-396a35dd51f1d58c051d0c1f1100e44950933d3b.tar.gz upstream-396a35dd51f1d58c051d0c1f1100e44950933d3b.tar.bz2 upstream-396a35dd51f1d58c051d0c1f1100e44950933d3b.zip | |
base-files: remove execute bit and shebang from functions.sh
/lib/functions.sh was executable for no obvious reason and its
execute property was even checked in package-ipkg.mk just to
source it afterwards.
Remove the execute bit and shebang as this is clearly a library.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Reviewed-by: Philip Prindeville <philipp@redfish-solutions.com>
| -rw-r--r-- | include/package-ipkg.mk | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | package/base-files/files/lib/functions.sh | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/package-ipkg.mk b/include/package-ipkg.mk index a92d692121..32de3cc93e 100644 --- a/include/package-ipkg.mk +++ b/include/package-ipkg.mk @@ -232,13 +232,13 @@ $(_endef) ( \ echo "#!/bin/sh"; \ echo "[ \"\$$$${IPKG_NO_SCRIPT}\" = \"1\" ] && exit 0"; \ - echo "[ -x "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \ + echo "[ -s "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \ echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \ echo "default_postinst \$$$$0 \$$$$@"; \ ) > postinst; \ ( \ echo "#!/bin/sh"; \ - echo "[ -x "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \ + echo "[ -s "\$$$${IPKG_INSTROOT}/lib/functions.sh" ] || exit 0"; \ echo ". \$$$${IPKG_INSTROOT}/lib/functions.sh"; \ echo "default_prerm \$$$$0 \$$$$@"; \ ) > prerm; \ diff --git a/package/base-files/files/lib/functions.sh b/package/base-files/files/lib/functions.sh index 272e230db2..2bad45324f 100755..100644 --- a/package/base-files/files/lib/functions.sh +++ b/package/base-files/files/lib/functions.sh @@ -1,4 +1,3 @@ -#!/bin/sh # Copyright (C) 2006-2014 OpenWrt.org # Copyright (C) 2006 Fokus Fraunhofer <carsten.tittel@fokus.fraunhofer.de> # Copyright (C) 2010 Vertical Communications |