mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-12 13:16:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

build-system: Cleanup script with shellcheck

Browse source 
Signed-off-by: Anton Lundin <glance@acc.umu.se>
This commit is contained in:
Anton Lundin 2018-06-18 21:36:22 +02:00 • committed by Dirk Hohndel
parent 5df93e084d
commit 5f4006ae4f
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
scripts/get-dep-lib.sh
View file

@ -26,7 +26,7 @@ CURRENT_BREEZE_ICONS=""
# url - repository url # url - repository url
# #
git_checkout_library() { git_checkout_library() {
[ $# -ne 3 ] && return -1 [ $# -ne 3 ] && return 1
# for clarity # for clarity
local name=$1 local name=$1
@ -45,7 +45,7 @@ git_checkout_library() {
git fetch origin git fetch origin
if ! git checkout "$version" ; then if ! git checkout "$version" ; then
echo "Can't find the right tag in $name - giving up" echo "Can't find the right tag in $name - giving up"
return -1 return 1
fi fi
fi fi
popd popd
@ -59,7 +59,7 @@ git_checkout_library() {
# filename - tarball file name # filename - tarball file name
# #
curl_download_library() { curl_download_library() {
[ $# -ne 3 ] && return -1 [ $# -ne 3 ] && return 1
local name=$1 local name=$1
local base_url=$2 local base_url=$2
@ -75,7 +75,7 @@ curl_download_library() {
# deal with all the command line arguments # deal with all the command line arguments
if [[ $# -ne 2 && $# -ne 3 ]] ; then if [ $# -ne 2 ] && [ $# -ne 3 ] ; then
echo "wrong number of parameters, format:" echo "wrong number of parameters, format:"
echo "get-dep-lib.sh <platform> <install dir>" echo "get-dep-lib.sh <platform> <install dir>"
echo "get-dep-lib.sh single <install dir> <lib>" echo "get-dep-lib.sh single <install dir> <lib>"
@ -90,9 +90,9 @@ fi
PLATFORM=$1 PLATFORM=$1
INSTDIR=$2 INSTDIR=$2
if [ ! -d ${INSTDIR} ] ; then if [ ! -d "${INSTDIR}" ] ; then
echo "creating dir" echo "creating dir"
mkdir -p ${INSTDIR} mkdir -p "${INSTDIR}"
fi fi
# FIX FOR ANDROID, # FIX FOR ANDROID,
@ -102,7 +102,7 @@ if [ "$PLATFORM" == "singleAndroid" ] ; then
fi fi
# no curl and old libs (never version breaks) # no curl and old libs (never version breaks)
# check whether to use curl or wget # check whether to use curl or wget
if [ "`which curl`" == "" ] ; then if [ "$(which curl)" == "" ] ; then
CURL="wget " CURL="wget "
else else
CURL="curl -O " CURL="curl -O "
@ -134,7 +134,7 @@ set -x
set -e set -e
# get ready to download needed sources # get ready to download needed sources
cd ${INSTDIR} cd "${INSTDIR}"
if [[ "$BUILD" = *"libcurl"* ]]; then if [[ "$BUILD" = *"libcurl"* ]]; then
git_checkout_library libcurl $CURRENT_LIBCURL https://github.com/curl/curl.git git_checkout_library libcurl $CURRENT_LIBCURL https://github.com/curl/curl.git