diff options
author | Christian Grothoff <christian@grothoff.org> | 2021-04-09 16:33:35 +0200 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2021-04-09 16:33:35 +0200 |
commit | 5fc1764db37d0fc68d0883bb272a06774274bfc3 (patch) | |
tree | 50319498e44418ce63ad43150bc5db3c030965da | |
parent | a1705fe4211340e380d50f48c177ca2d66bf7b8b (diff) |
do not upgrade gana to master on bootstrap
-rwxr-xr-x | bootstrap | 6 | ||||
-rwxr-xr-x | contrib/gana.sh | 4 | ||||
-rw-r--r-- | src/json/json.c | 2 |
3 files changed, 7 insertions, 5 deletions
@@ -7,6 +7,12 @@ if ! git --version >/dev/null; then exit 1 fi + +git submodule update --init + +./contrib/gana-update.sh + + ./contrib/gana.sh # This is more portable than `which' but comes with diff --git a/contrib/gana.sh b/contrib/gana.sh index 1055d778b..0475d7ffb 100755 --- a/contrib/gana.sh +++ b/contrib/gana.sh @@ -3,10 +3,6 @@ # Run from exchange/ main directory. set -eu -git submodule update --init - cd contrib/gana git pull origin master cd ../.. - -./contrib/gana-update.sh diff --git a/src/json/json.c b/src/json/json.c index d0d44058d..e9fbb91f8 100644 --- a/src/json/json.c +++ b/src/json/json.c @@ -1,6 +1,6 @@ /* This file is part of TALER - Copyright (C) 2014, 2015, 2016, 2020 Taler Systems SA + Copyright (C) 2014, 2015, 2016, 2020, 2021 Taler Systems SA TALER is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software |