Merge pull request #22 from VividCortex/improved_comments_fix

Improved comments fix
VividCortex · Aug 8, 2013 · 8c378b8 · 8c378b8
2 parents 656b6bb + a091fe5
commit 8c378b8
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/bin/johnny_deps b/bin/johnny_deps
@@ -11,19 +11,18 @@ set -eu
 
 root=$PWD
 godeps=${1-"Godeps"}
+deps=$(sed 's/#.*//;/^\s*$/d' < "$godeps")
 
 while read package version; do
-  [[ -z "$package" || "$package" =~ ^# ]] && continue
   go get -v -u -d "$package"
   echo "Setting $package to version $version"
   cd "${GOPATH%%:*}/src/${package%%/...}"
   git checkout "$version"
-done < "$godeps"
+done < <(echo "$deps")
 
 cd "$root"
 
 while read package version; do
-  [[ -z "$package" || "$package" =~ ^# ]] && continue
   echo "Installing $package"
   go install "$package"
-done < "$godeps"
+done < <(echo "$deps")
diff --git a/test/commented_lines_are_ignored_test.sh b/test/commented_lines_are_ignored_test.sh
@@ -2,9 +2,13 @@
 . assert.sh
 
 # Setting up v5.0 of package
-echo "github.com/pote/johnny-deps-testing-package v5.0"   > Godeps
-echo "#github.com/pote/johnny-deps-testing-package v5.1"  >> Godeps
-echo "# github.com/pote/johnny-deps-testing-package v5.1" >> Godeps
+cat > Godeps <<EOF
+# A comment here...
+github.com/nu7hatch/gotrail v0.0.2
+github.com/pote/johnny-deps-testing-package v5.0 # a comment there!
+
+# github.com/pote/johnny-deps-testing-package v5.1
+EOF
 
 ../bin/johnny_deps
 assert "go run go_code.go" "v5.0"