Fix for installing prereqs for update-cbdep from svn

ceejatec · ceejatec · commit 54ccb1b5e1ee · 2021-10-15T07:24:35.000Z
Change-Id: If2f413e8d9dabebd2311bcef5b4b10de4a9f899e Reviewed-on: http://review.couchbase.org/c/build-tools/+/163695 Tested-by: Chris Hillery <ceej@couchbase.com> Reviewed-by: Chris Hillery <ceej@couchbase.com>
diff --git a/cbdeps/scripts/update-cbdep-svn2github b/cbdeps/scripts/update-cbdep-svn2github
@@ -14,7 +14,7 @@ type -P svn > /dev/null 2>&1 || {
     sudo apt-get update
     sudo apt-get install -y subversion
 }
-git --help svn > /dev/null 2>&1 || {
+[ -e /usr/lib/git-core/git-svn ] || {
     sudo apt-get update
     sudo apt-get install -y git-svn
 }

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ type -P svn > /dev/null 2>&1 \|\| {`
`14`	`14`	`sudo apt-get update`
`15`	`15`	`sudo apt-get install -y subversion`
`16`	`16`	`}`
`17`		`-git --help svn > /dev/null 2>&1 \|\| {`
	`17`	`+[ -e /usr/lib/git-core/git-svn ] \|\| {`
`18`	`18`	`sudo apt-get update`
`19`	`19`	`sudo apt-get install -y git-svn`
`20`	`20`	`}`