summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrii Kroitor <an.kroitor@samsung.com>2016-10-10 18:19:26 +0300
committerAndrii Kroitor <an.kroitor@samsung.com>2016-10-10 18:19:26 +0300
commit3b333661be4caa1b867dffb584d5b6f2ec260cbd (patch)
treef2dee9df86eb3cdd9ba8922ec29edf5085968991
parentea2ecef0a75633637cf5681c23d7aa9d2677a347 (diff)
fix shellcheck warnings
-rwxr-xr-xconfigure_efl.sh11
-rwxr-xr-xconfigure_eflete.sh11
-rwxr-xr-xsetup_deps.sh11
3 files changed, 18 insertions, 15 deletions
diff --git a/configure_efl.sh b/configure_efl.sh
index 9871ce2..d19d37d 100755
--- a/configure_efl.sh
+++ b/configure_efl.sh
@@ -1,3 +1,4 @@
1#!/bin/bash
1set -e 2set -e
2 3
3if [ "$#" -ne 0 ]; then 4if [ "$#" -ne 0 ]; then
@@ -44,11 +45,11 @@ export PKG_CONFIG_PATH=""
44 --disable-cxx-bindings \ 45 --disable-cxx-bindings \
45 --disable-image-loader-jp2k \ 46 --disable-image-loader-jp2k \
46 --disable-static \ 47 --disable-static \
47 --with-eolian-gen=`which eolian_gen` \ 48 --with-eolian-gen= "$(which eolian_gen)" \
48 --with-edje-cc=`which edje_cc` \ 49 --with-edje-cc= "$(which edje_cc)" \
49 --with-eet-eet=`which eet` \ 50 --with-eet-eet= "$(which eet)" \
50 --with-elm-prefs-cc=`which elm_prefs_cc` \ 51 --with-elm-prefs-cc= "$(which elm_prefs_cc)" \
51 --with-elementary-codegen=`which elementary_codegen` 52 --with-elementary-codegen="$(which elementary_codegen)"
52make clean 53make clean
53make 54make
54make install 55make install
diff --git a/configure_eflete.sh b/configure_eflete.sh
index 04c772b..0bc38f9 100755
--- a/configure_eflete.sh
+++ b/configure_eflete.sh
@@ -1,3 +1,4 @@
1#!/bin/bash
1set -e 2set -e
2 3
3if [ "$#" -ne 0 ]; then 4if [ "$#" -ne 0 ]; then
@@ -33,11 +34,11 @@ export PKG_CONFIG_PATH="/opt/windows_$BITS/lib/pkgconfig"
33 --host=$HOST \ 34 --host=$HOST \
34 --disable-audio \ 35 --disable-audio \
35 --disable-nls \ 36 --disable-nls \
36 --with-eolian-gen=`which eolian_gen` \ 37 --with-eolian-gen= "$(which eolian_gen)" \
37 --with-edje-cc=`which edje_cc` \ 38 --with-edje-cc= "$(which edje_cc)" \
38 --with-eet-eet=`which eet` \ 39 --with-eet-eet= "$(which eet)" \
39 --with-elm-prefs-cc=`which elm_prefs_cc` \ 40 --with-elm-prefs-cc= "$(which elm_prefs_cc)" \
40 --with-elementary-codegen=`which elementary_codegen` 41 --with-elementary-codegen="$(which elementary_codegen)"
41make clean 42make clean
42make 43make
43make install 44make install
diff --git a/setup_deps.sh b/setup_deps.sh
index 3d6c28c..9c8ceaf 100755
--- a/setup_deps.sh
+++ b/setup_deps.sh
@@ -1,3 +1,4 @@
1#!/bin/bash
1set -e 2set -e
2 3
3if [ "$#" -ne 0 ]; then 4if [ "$#" -ne 0 ]; then
@@ -18,13 +19,13 @@ LIST="env_config/win_builds_$BITS.list"
18BASE_URL="http://win-builds.org/1.5.0/packages/windows_$BITS/" 19BASE_URL="http://win-builds.org/1.5.0/packages/windows_$BITS/"
19BASE_PATH="/opt/windows_$BITS" 20BASE_PATH="/opt/windows_$BITS"
20 21
21if [[ -f $BASE_PATH && -L $BASE_PATH ]] ; 22if [ -e $BASE_PATH ] && [ -L $BASE_PATH ] ;
22then 23then
23 echo "Removing old link $BASE_PATH" 24 echo "Removing old link $BASE_PATH"
24 sudo rm $BASE_PATH 25 sudo rm $BASE_PATH
25fi 26fi
26echo "Creating new link $BASE_PATH -> $PWD$BASE_PATH" 27echo "Creating new link $BASE_PATH -> $PWD$BASE_PATH"
27sudo ln -s $PWD$BASE_PATH /opt/ 28sudo ln -s "$PWD$BASE_PATH" /opt/
28echo "" 29echo ""
29 30
30echo "Downloading packages into ./download/" 31echo "Downloading packages into ./download/"
@@ -32,8 +33,8 @@ mkdir -p download
32while read pkg; do 33while read pkg; do
33 if [[ ! ${pkg:0:1} == "#" ]] ; 34 if [[ ! ${pkg:0:1} == "#" ]] ;
34 then 35 then
35 if [ ! -f download/$pkg ]; then 36 if [ ! -f "download/$pkg" ]; then
36 wget $BASE_URL$pkg -P download -q 37 wget "$BASE_URL$pkg" -P download -q
37 fi 38 fi
38 echo "[+] $pkg" 39 echo "[+] $pkg"
39 fi 40 fi
@@ -46,7 +47,7 @@ mkdir -p opt
46while read pkg; do 47while read pkg; do
47if [[ ! ${pkg:0:1} == "#" ]] ; 48if [[ ! ${pkg:0:1} == "#" ]] ;
48then 49then
49 tar -xf download/$pkg -C opt 50 tar -xf "download/$pkg" -C opt
50 echo "[+] $pkg" 51 echo "[+] $pkg"
51fi 52fi
52done < $LIST 53done < $LIST