From 3dcc84f95f81dc697adc0c1a245fc31f78f09a9e Mon Sep 17 00:00:00 2001 From: Marcello Stanisci Date: Fri, 24 Nov 2017 17:16:55 +0100 Subject: unique script to update all frontends --- taler-build/update_merchant_frontends.sh | 22 ++++++++++++---------- taler-build/update_merchant_survey.sh | 17 ----------------- 2 files changed, 12 insertions(+), 27 deletions(-) delete mode 100755 taler-build/update_merchant_survey.sh diff --git a/taler-build/update_merchant_frontends.sh b/taler-build/update_merchant_frontends.sh index 3a1324e..8713b08 100755 --- a/taler-build/update_merchant_frontends.sh +++ b/taler-build/update_merchant_frontends.sh @@ -2,16 +2,18 @@ set -eu -cd $HOME/merchant-frontends/ -git clean -fxd +for frontend in blog donations survey; do + cd $HOME/frontend/ + git clean -fxd -git fetch -# reset to updated upstream branch, but only if we're tracking a branch -branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo HEAD) -git reset --hard "$branch" + git fetch + # reset to updated upstream branch, but only if we're tracking a branch + branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo HEAD) + git reset --hard "$branch" -git submodule update --init --force + git submodule update --init --force -./bootstrap -./configure --prefix="$HOME/local" -make install check + ./bootstrap + ./configure --prefix="$HOME/local" + make install check +done diff --git a/taler-build/update_merchant_survey.sh b/taler-build/update_merchant_survey.sh deleted file mode 100755 index 11f5dbd..0000000 --- a/taler-build/update_merchant_survey.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -set -eu - -cd $HOME/survey/ -git clean -fxd - -git fetch -# reset to updated upstream branch, but only if we're tracking a branch -branch=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null || echo HEAD) -git reset --hard "$branch" - -git submodule update --init --force - -./bootstrap -./configure --prefix="$HOME/local" -make install -- cgit v1.2.3