Merge pull request #645 from reyoung/feature/improve_paddle_version_check

wangkuiyi · web-flow · commit 765735b698a5 · 2016-11-28T21:46:16.000-08:00
Add `set -e` for paddle boot up script.
diff --git a/paddle/scripts/submit_local.sh.in b/paddle/scripts/submit_local.sh.in
@@ -29,6 +29,7 @@ function version(){
 }
 
 function ver2num() {
+  set -e
   # convert version to number.
   if [ -z "$1" ]; then # empty argument
     printf "%03d%03d%03d%03d%03d" 0
@@ -41,6 +42,7 @@ function ver2num() {
       printf "%03d%03d%03d%03d%03d" $VERN
     fi
   fi
+  set +e
 }
 
 PADDLE_CONF_HOME="$HOME/.config/paddle"

Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,7 @@ function version(){`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`function ver2num() {`
	`32`	`+ set -e`
`32`	`33`	`# convert version to number.`
`33`	`34`	`if [ -z "$1" ]; then # empty argument`
`34`	`35`	`printf "%03d%03d%03d%03d%03d" 0`
`@@ -41,6 +42,7 @@ function ver2num() {`
`41`	`42`	`printf "%03d%03d%03d%03d%03d" $VERN`
`42`	`43`	`fi`
`43`	`44`	`fi`
	`45`	`+ set +e`
`44`	`46`	`}`
`45`	`47`
`46`	`48`	`PADDLE_CONF_HOME="$HOME/.config/paddle"`