From 48de529bcf20c50890bb4c1e52f6ff68c7883613 Mon Sep 17 00:00:00 2001 From: Kelson Date: Mon, 26 Aug 2019 16:25:34 +0200 Subject: [PATCH] Stop using backticks in Shell script --- create-signed-android-release.sh | 6 +++--- install-kiwix-on-device.sh | 2 +- make-screenshot.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/create-signed-android-release.sh b/create-signed-android-release.sh index 7b1a3b25a..636d07537 100755 --- a/create-signed-android-release.sh +++ b/create-signed-android-release.sh @@ -22,9 +22,9 @@ function die { } # default values are guessed from repo (AndroidManifest and res/values/branding) -APP_NAME=`python -c "from xml.dom.minidom import parse; d=parse('res/values/branding.xml'); print([e.childNodes[0].data.strip() for e in d.getElementsByTagName('string') if e.getAttribute('name') == 'app_name'][-1])"` -TARGET_VERSION=`grep "compileSdkVersion" build.gradle | awk '{print $2}'` -BUILD_VERSION=`grep "buildToolsVersion" build.gradle | awk '{print $2}' | sed 's/"//g'` +APP_NAME=$(python -c "from xml.dom.minidom import parse; d=parse('res/values/branding.xml'); print([e.childNodes[0].data.strip() for e in d.getElementsByTagName('string') if e.getAttribute('name') == 'app_name'][-1])") +TARGET_VERSION=$(grep "compileSdkVersion" build.gradle | awk '{print $2}') +BUILD_VERSION=$(grep "buildToolsVersion" build.gradle | awk '{print $2}' | sed 's/"//g') if [ "x$2" != "x" ]; then diff --git a/install-kiwix-on-device.sh b/install-kiwix-on-device.sh index 784d27d09..bfa03fc2c 100755 --- a/install-kiwix-on-device.sh +++ b/install-kiwix-on-device.sh @@ -1,7 +1,7 @@ #!/bin/bash # default value is guessed from repo (AndroidManifest) -PACKAGE=`python -c "from xml.dom.minidom import parse; d=parse('app/src/main/AndroidManifest.xml'); print([e.getAttribute('package').strip() for e in d.getElementsByTagName('manifest')][-1])"` +PACKAGE=$(python -c "from xml.dom.minidom import parse; d=parse('app/src/main/AndroidManifest.xml'); print([e.getAttribute('package').strip() for e in d.getElementsByTagName('manifest')][-1])") if [ "x$1" != "x" ]; then diff --git a/make-screenshot.sh b/make-screenshot.sh index d943b9ba0..d2a80c458 100755 --- a/make-screenshot.sh +++ b/make-screenshot.sh @@ -2,7 +2,7 @@ if hash adb 2>/dev/null then - ADB=`which adb` + ADB=$(which adb) TMP=/data/local/tmp/ FILE=${1:-screenshot.png} PATH=$TMP$FILE