From b8fcd7cf83f1e92e0bcf21839aff6a57d5f5ed03 Mon Sep 17 00:00:00 2001 From: FPille Date: Mon, 5 Aug 2019 22:48:18 +0200 Subject: [PATCH] Improve find expressions/options --- appimage/AppRun.sh | 6 +++--- build-appimage.sh | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/appimage/AppRun.sh b/appimage/AppRun.sh index 81e6639f..6264e6e6 100755 --- a/appimage/AppRun.sh +++ b/appimage/AppRun.sh @@ -53,7 +53,7 @@ if [ "$1" == "--list-programs" ] ; then echo "" echo "Run \"$ARGV0\" with one of the following arguments to run the respective program." echo "" - find . -type f -perm /111 ! -path '*/lib/*' -execdir basename {} ";" | sort | column + find . -type f -perm /111 ! -path '*/lib/*' -execdir basename {} ";" | sort -u | column echo "" exit $? fi @@ -63,8 +63,8 @@ if [ "$1" == "--list-licenses" ] ; then echo "" echo "Run \"$ARGV0\" with one of the following arguments to display the respective license file." echo "" - find . -type f \( -iname "license*" -o -iname "*copyright*" -o -iname "*copying*" \) \ - -printf "--show-license %P\n" | sort | column + find . -type f \( ! -path '*/tesseract-ocr-*' -o -path '*/tesseract-ocr-eng/*' \) \ + \( -iname "license*" -o -iname "*copyright*" -o -iname "*copying*" \) -printf "--show-license %P\n" | sort | column echo "" exit $? fi diff --git a/build-appimage.sh b/build-appimage.sh index 63ca841c..3ed4595e 100644 --- a/build-appimage.sh +++ b/build-appimage.sh @@ -90,8 +90,8 @@ popd pushd "$BUILD_DIR"/AppDir # add some tools to AppDir -cp -f /usr/bin/column ./usr/bin/ -cp -f /bin/less ./usr/bin/ +#cp -f /usr/bin/column ./usr/bin/ +#cp -f /bin/less ./usr/bin/ # remove unnecessary data from AppDir [ -d bin ] && rm -rf ./bin