release-version.sh: simplify skip-gpg test

ctrueden · ctrueden · commit 600e054e99d9 · 2018-04-10T16:36:13.000-05:00
diff --git a/release-version.sh b/release-version.sh
@@ -21,10 +21,8 @@ valid_semver_bump () {
 }
 
 verify_gpg_settings () {
-	if [ ! "$SKIP_GPG" ]
-	then
-		test -f .travis/signingkey.asc.enc ||
-			die 'GPG configuration not found. Please use travisify.sh to add it.
+	test "$SKIP_GPG" -o -f .travis/signingkey.asc.enc ||
+		die 'GPG configuration not found. Please use travisify.sh to add it.
 See also: https://github.com/scijava/pom-scijava/wiki/GPG-Signing'
 	fi
 }

Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,8 @@ valid_semver_bump () {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`verify_gpg_settings () {`
`24`		`- if [ ! "$SKIP_GPG" ]`
`25`		`- then`
`26`		`- test -f .travis/signingkey.asc.enc \|\|`
`27`		`- die 'GPG configuration not found. Please use travisify.sh to add it.`
	`24`	`+ test "$SKIP_GPG" -o -f .travis/signingkey.asc.enc \|\|`
	`25`	`+ die 'GPG configuration not found. Please use travisify.sh to add it.`
`28`	`26`	`See also: https://github.com/scijava/pom-scijava/wiki/GPG-Signing'`
`29`	`27`	`fi`
`30`	`28`	`}`