Эх сурвалжийг харах

Merge pull request #232 from infosiftr/whitespaaace

Fail on whitespace at end of lines
Tianon Gravi 11 жил өмнө
parent
commit
70012bbf6e
2 өөрчлөгдсөн 10 нэмэгдсэн , 6 устгасан
  1. 9 5
      bashbrew/build.sh
  2. 1 1
      library/mageia

+ 9 - 5
bashbrew/build.sh

@@ -154,11 +154,15 @@ for repoTag in "${repos[@]}"; do
 	tags=()
 	for line in "${repoTagLines[@]}"; do
 		tag="$(echo "$line" | awk -F ': +' '{ print $1 }')"
-		fullGitUrl="$(echo "$line" | awk -F ' +' '{ print $2 }')"
-		gitDir="$(echo "$line" | awk -F ' +' '{ print $3 }')"
+		repoDir="$(echo "$line" | awk -F ': +' '{ print $2 }')"
 		
-		gitUrl="${fullGitUrl%%@*}"
-		gitRef="${fullGitUrl#*@}"
+		gitUrl="${repoDir%%@*}"
+		commitDir="${repoDir#*@}"
+		gitRef="${commitDir%% *}"
+		gitDir="${commitDir#* }"
+		if [ "$gitDir" = "$commitDir" ]; then
+			gitDir=
+		fi
 		
 		gitRepo="${gitUrl#*://}"
 		gitRepo="${gitRepo%/}"
@@ -231,7 +235,7 @@ while [ "$#" -gt 0 ]; do
 	# TODO git tag
 	
 	if [ ! -d "$gitRepo/$gitDir" ]; then
-		echo "- failed; invalid dir: $gitDir"
+		echo "- failed; invalid dir: '$gitDir'"
 		didFail=1
 		continue
 	fi

+ 1 - 1
library/mageia

@@ -1,6 +1,6 @@
 # maintainer: Juan Luis Baptiste <[email protected]> (@juanluisbaptiste)
 
 latest: git://github.com/juanluisbaptiste/docker-brew-mageia@603a75ec98dfd7c26ed85108b309d4e5f39ded91 4
-cauldron: git://github.com/juanluisbaptiste/docker-brew-mageia@603a75ec98dfd7c26ed85108b309d4e5f39ded91 cauldron 
+cauldron: git://github.com/juanluisbaptiste/docker-brew-mageia@603a75ec98dfd7c26ed85108b309d4e5f39ded91 cauldron
 4: git://github.com/juanluisbaptiste/docker-brew-mageia@603a75ec98dfd7c26ed85108b309d4e5f39ded91 4
 3: git://github.com/juanluisbaptiste/docker-brew-mageia@603a75ec98dfd7c26ed85108b309d4e5f39ded91 3