mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#105204 shellcheck

Browse Source 
addressed issues in order of appearance:
warnings
 - prefer [..] && [..] (SC2166)
 - unused 'awkCMD' (SC2034)
 - typo currentFirstLIne -> currentFirstLine (SC2154)

recommendations
 - use $(..) instead of `..` (SC2006)
 - remove $ on arithmetic variable OPTIND (SC2004)
 - double quote to prevent globbing in $findArgs (SC2086)

Change-Id: I2d2b7aecac97b2e4e0df8ce556c85995d4ecf7cf
Reviewed-on: https://gerrit.libreoffice.org/33003
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
This commit is contained in:
Jochen Nitschke
2017-01-11 11:49:18 +01:00
committed by Michael Stahl
parent e81454861f
commit 1ad45ecbf1
1 changed files with 10 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
solenv/bin/add-modelines
View File

@@ -43,10 +43,10 @@ ModelineReplace="false"
function SetEnvironment() function SetEnvironment()
{ {
if [ -n "$(which tail)" -a -n "$(which head)" ]; then if [ -n "$(which tail)" ] && [ -n "$(which head)" ]; then
{ {
headCMD=`which head` headCMD=$(which head)
tailCMD=`which tail` tailCMD=$(which tail)
} }
else else
{ {
@@ -55,21 +55,13 @@ function SetEnvironment()
} }
fi fi
if [ -n "$(which find)" ]; then if [ -n "$(which find)" ]; then
findCMD=`which find` findCMD=$(which find)
else else
{ {
echo "Missing find, exiting..." echo "Missing find, exiting..."
exit 1 exit 1
} }
fi fi
if [ -n "$(which awk)" ]; then
awkCMD=`which awk`
else
{
echo "Missing awk, exiting..."
exit 1
}
fi
} }
function EditFile() function EditFile()
@@ -80,12 +72,12 @@ function EditFile()
FileToEdit="$1" FileToEdit="$1"
currentFirstLine=`$headCMD -1 "$FileToEdit"` currentFirstLine=$($headCMD -1 "$FileToEdit")
currentLastLine=`$tailCMD -1 "$FileToEdit"` currentLastLine=$($tailCMD -1 "$FileToEdit")
case "$ModelineReplace" in case "$ModelineReplace" in
"true" ) "true" )
if [ "${currentFirstLIne:0:6}" = "${FirstLine:0:6}" ]; then if [ "${currentFirstLine:0:6}" = "${FirstLine:0:6}" ]; then
{ {
echo "$FirstLine" > "$FileToEdit".new echo "$FirstLine" > "$FileToEdit".new
$tailCMD -n +2 "$FileToEdit" >> "$FileToEdit".new $tailCMD -n +2 "$FileToEdit" >> "$FileToEdit".new
@@ -144,7 +136,7 @@ while getopts "zs:p:" opt; do
done done
if [ $OPTIND -gt 1 ]; then if [ $OPTIND -gt 1 ]; then
shift $(($OPTIND - 1)) shift $((OPTIND - 1))
fi fi
if [ $# -gt 1 ]; then if [ $# -gt 1 ]; then
@@ -167,9 +159,9 @@ for FileType in ${SourceFiles}; do
done done
# This gets rid of the final " -a " in the find argument list # This gets rid of the final " -a " in the find argument list
findArgs="${findArgs:0:(${#findArgs}-3)}" findArgs=(${findArgs:0:(${#findArgs}-3)})
for file in $($findCMD $findArgs); do for file in $($findCMD "${findArgs[@]}"); do
EditFile "$file" EditFile "$file"
echo "Completed: " "$file" echo "Completed: " "$file"
done done