diff options
| -rwxr-xr-x | bootstrap | 3 | ||||
| -rw-r--r-- | contrib/Makefile.am | 2 | ||||
| -rwxr-xr-x | contrib/gana-generate.sh (renamed from contrib/gana-update.sh) | 0 | ||||
| -rwxr-xr-x | contrib/gana-latest.sh (renamed from contrib/gana.sh) | 2 |
4 files changed, 4 insertions, 3 deletions
@@ -18,7 +18,8 @@ fi echo "$0: Updating submodules" echo | git submodule update --init -./contrib/gana.sh +# Generate based on pinned submodule +./contrib/gana-generate.sh # This is more portable than `which' but comes with # the caveat of not(?) properly working on busybox's ash: diff --git a/contrib/Makefile.am b/contrib/Makefile.am index f8e0a8ebf..fb4165fa2 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -49,7 +49,7 @@ EXTRA_DIST = \ taler-bank-manage-testing \ taler-nexus-prepare \ taler-terms-generator.in \ - gana-update.sh \ + gana-generate.sh \ gana/gnu-taler-error-codes/registry.rec \ gana/gnu-taler-error-codes/Makefile \ $(terms_DATA) \ diff --git a/contrib/gana-update.sh b/contrib/gana-generate.sh index 4679e2003..4679e2003 100755 --- a/contrib/gana-update.sh +++ b/contrib/gana-generate.sh diff --git a/contrib/gana.sh b/contrib/gana-latest.sh index 30dc7994e..e92761acc 100755 --- a/contrib/gana.sh +++ b/contrib/gana-latest.sh @@ -7,4 +7,4 @@ cd contrib/gana git pull origin master cd ../.. -exec ./contrib/gana-update.sh +exec ./contrib/gana-generate.sh |