aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2017-01-30 16:57:06 -0600
committerluigi1111 <luigi1111w@gmail.com>2017-01-30 16:57:06 -0600
commitbe564921d812667763b9e83cac9ca2dc814b0a01 (patch)
tree261bf25697dc432d5f94d0fbb0594e9324ec4dce
parentef9bf72b52594ef3d92597970a5c2bc61e02a5a9 (diff)
parentf4e01e575636986f4c3cb39f6296a7907900ff28 (diff)
downloadmonzero-gui-be564921d812667763b9e83cac9ca2dc814b0a01.tar.gz
monzero-gui-be564921d812667763b9e83cac9ca2dc814b0a01.tar.xz
monzero-gui-be564921d812667763b9e83cac9ca2dc814b0a01.zip
Merge pull request 441
f4e01e5 Fix git username in build script (Jaqueeee)
-rwxr-xr-xget_libwallet_api.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh
index 1d0d9351..d4d5dae4 100755
--- a/get_libwallet_api.sh
+++ b/get_libwallet_api.sh
@@ -26,7 +26,7 @@ git -C $MONERO_DIR checkout -B $VERSIONTAG
# Workaround for git username requirements
# Save current user settings and revert back when we are done with merging PR's
-OLD_GIT_USER=$(git -C $MONERO_DIR config --local user.user)
+OLD_GIT_USER=$(git -C $MONERO_DIR config --local user.name)
OLD_GIT_EMAIL=$(git -C $MONERO_DIR config --local user.email)
git -C $MONERO_DIR config user.name "Monero GUI"
git -C $MONERO_DIR config user.email "gui@monero.local"
@@ -40,7 +40,7 @@ for PR in $(git log --format=%B -n 1 | grep -io "requires #[0-9]*" | sed 's/[^0-
done
# revert back to old git config
-$(git -C $MONERO_DIR config user.user "$OLD_GIT_USER")
+$(git -C $MONERO_DIR config user.name "$OLD_GIT_USER")
$(git -C $MONERO_DIR config user.email "$OLD_GIT_EMAIL")
# Build libwallet if it doesnt exist