[Libreoffice-commits] core.git: g

[Ilmari Lauhakangas]

 g |   52 ++++++++++++++++++++++++++--------------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

New commits:
commit 55c5b27bd683a7c36f07c1be781d8baad30b4571
Author: Ilmari Lauhakangas <ilmari.lauhakangas at libreoffice.org>
Date:   Sat Apr 15 18:35:17 2017 +0300

    tdf#105204: ShellCheck nitpicks for g
    
    Change-Id: I1814bc65c62af1a92a090127f1cfda8ad228936d
    SC2002: Useless cat.
    SC2045: Iterating over ls output is fragile.
    SC2166: Prefer [ p ] || [ q ] as [ p -o q ] is not well defined.
    SC2006: Use $(..) instead of legacy `..`
    Reviewed-on: https://gerrit.libreoffice.org/36571
    Reviewed-by: Michael Stahl <mstahl at redhat.com>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/g b/g
index 3d2a37d65723..38e9db928772 100755
--- a/g
+++ b/g
@@ -12,7 +12,7 @@ SUBMODULES_ALL="dictionaries helpcontent2 translations"
 pushd $(dirname $0) > /dev/null
 if [ -f config_host.mk ] ; then
     # we are in the BUILDDIR
-    SRC_ROOT=$(cat config_host.mk | grep -a SRC_ROOT | sed -e "s/.*=//")
+    SRC_ROOT=$(< config_host.mk grep -a SRC_ROOT | sed -e "s/.*=//")
 else
     SRC_ROOT=$(pwd)
 fi
@@ -37,35 +37,35 @@ local hook_name
 
     if [ -d ${repo?}/.git ] ; then
         # use core's hook by default
-	for hook_name in $(ls -1 "${COREDIR?}/.git-hooks") ; do
-            hook="${repo?}/.git/hooks/${hook_name?}"
-            if [ ! -e "${hook?}" -o -L "${hook?}" ] ; then
+	for hook_name in ${COREDIR?}/.git-hooks/* ; do
+            hook="${repo?}/.git/hooks/${hook_name##*/}"
+            if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
 		rm -f "${hook?}"
-		ln -sf "${COREDIR?}/.git-hooks/${hook_name?}" "${hook?}"
+		ln -sf "${hook_name}" "${hook?}"
             fi
 	done
         # override if need be by the submodules' own hooks
-	for hook_name in $(ls -1 "${COREDIR?}/${repo?}/.git-hooks" 2>/dev/null) ; do
-            hook="${repo?}/.git/hooks/${hook_name?}"
-            if [ ! -e "${hook?}" -o -L "${hook?}" ] ; then
+	for hook_name in ${COREDIR?}/${repo?}/.git-hooks/* ; do
+            hook="${repo?}/.git/hooks/${hook_name##*/}"
+            if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
 		rm -f "${hook?}"
-		ln -sf "${COREDIR?}/${repo?}/.git-hooks/${hook_name?}" "${hook?}"
+		ln -sf "${hook_name}" "${hook?}"
 	    fi
 	done
     elif [ -d .git/modules/${repo}/hooks ] ; then
-	for hook_name in $(ls -1 "${COREDIR?}/.git-hooks") ; do
-            hook=".git/modules/${repo?}/hooks/${hook_name?}"
-            if [ ! -e "${hook?}" -o -L "${hook?}" ] ; then
+	for hook_name in ${COREDIR?}/.git-hooks/* ; do
+            hook=".git/modules/${repo?}/hooks/${hook_name##*/}"
+            if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
 		rm -f "${hook?}"
-		ln -sf "${COREDIR?}/.git-hooks/${hook_name?}" "${hook?}"
+		ln -sf "${hook_name}" "${hook?}"
             fi
 	done
         # override if need be by the submodules' own hooks
-	for hook_name in $(ls -1 "${COREDIR?}/${repo?}/.git-hooks" 2>/dev/null) ; do
-            hook=".git/modules/${repo?}/hooks/${hook_name?}"
-            if [ ! -e "${hook?}" -o -L "${hook?}" ] ; then
+	for hook_name in ${COREDIR?}/${repo?}/.git-hooks/* ; do
+            hook=".git/modules/${repo?}/hooks/${hook_name##*/}"
+            if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
 		rm -f "${hook?}"
-		ln -sf "${COREDIR?}/${repo?}/.git-hooks/${hook_name?}" "${hook?}"
+		ln -sf "${hook_name}" "${hook?}"
 	    fi
 	done
     fi
@@ -79,11 +79,11 @@ local hook_name
 local hook
 
     pushd "${COREDIR?}" > /dev/null
-    for hook_name in $(ls -1 "${COREDIR?}/.git-hooks") ; do
-        hook=".git/hooks/${hook_name?}"
-        if [ ! -e "${hook?}" -o -L "${hook?}" ] ; then
+    for hook_name in ${COREDIR?}/.git-hooks/* ; do
+        hook=".git/hooks/${hook_name##*/}"
+        if [ ! -e "${hook?}" ] || [ -L "${hook?}" ] ; then
             rm -f "${hook?}"
-            ln -sf "${COREDIR?}/.git-hooks/${hook_name?}" "${hook?}"
+            ln -sf "${hook_name}" "${hook?}"
         fi
     done
 
@@ -137,7 +137,7 @@ SUBMODULES_ACTIVE=""
 local repo
 
     for repo in ${SUBMODULES_ALL?} ; do
-	if [ -d ${repo?}/.git -o -f ${repo?}/.git ] ; then
+	if [ -d ${repo?}/.git ] || [ -f ${repo?}/.git ] ; then
 	    SUBMODULES_ACTIVE="${repo?} ${SUBMODULES_ACTIVE?}"
 	fi
     done
@@ -147,7 +147,7 @@ get_configured_submodules()
 {
     SUBMODULES_CONFIGURED=""
     if [ -f config_host.mk ] ; then
-	SUBMODULES_CONFIGURED=$(cat config_host.mk | grep -a GIT_NEEDED_SUBMODULES | sed -e "s/.*=//")
+	SUBMODULES_CONFIGURED=$(< config_host.mk grep -a GIT_NEEDED_SUBMODULES | sed -e "s/.*=//")
     else
 	# if we need the configured submoduel before the configuration is done. we assumed you want them all
 	SUBMODULES_CONFIGURED=${SUBMODULES_ALL?}
@@ -158,11 +158,11 @@ get_git_reference()
 {
     REFERENCED_GIT=""
     if [ -f config_host.mk ]; then
-	REFERENCED_GIT=$(cat config_host.mk | grep -a GIT_REFERENCE_SRC | sed -e "s/.*=//")
+	REFERENCED_GIT=$(< config_host.mk grep -a GIT_REFERENCE_SRC | sed -e "s/.*=//")
     fi
     LINKED_GIT=""
     if [ -f config_host.mk ]; then
-	LINKED_GIT=$(cat config_host.mk | grep -a GIT_LINK_SRC | sed -e "s/.*=//")
+	LINKED_GIT=$(< config_host.mk grep -a GIT_LINK_SRC | sed -e "s/.*=//")
     fi
 }
 
@@ -287,7 +287,7 @@ if [ "$#" -eq "0" ] ; then
     usage
 fi
 
-if [ ! "`type -p git`" ]; then
+if [ ! "$(type -p git)" ]; then
     echo "Cannot find the git binary! Is git installed and is in PATH?"
     exit 1
 fi