[Git][java-team/pkg-java-scripts][master] SALSA_TOKEN in environment

[Geert Stappers]

Geert Stappers pushed to branch master at Debian Java Maintainers / pkg-java-scripts


Commits:
cb4ebbaf by Geert Stappers at 2018-06-24T13:27:54+02:00
SALSA_TOKEN in environment

- - - - -


2 changed files:

- migrate-to-salsa
- setup-salsa-repository


Changes:

=====================================
migrate-to-salsa
=====================================
--- a/migrate-to-salsa
+++ b/migrate-to-salsa
@@ -24,7 +24,7 @@ check_return_code() {
     fi
 }
 
-. ~/.salsarc
+test -n "$SALSA_TOKEN" || . ~/.salsarc
 
 PACKAGE=$1
 


=====================================
setup-salsa-repository
=====================================
--- a/setup-salsa-repository
+++ b/setup-salsa-repository
@@ -5,7 +5,8 @@
 # This script uses the GitLab REST API and requires an access token.
 # The token is obtained from the GitLab profile page -> Access Tokens
 # (https://salsa.debian.org/profile/personal_access_tokens).
-# The token is expected to be found in the ~/.salsarc file and assigned
+# The token is in the environment variable SALSA_TOKEN
+# or has to be sourced from the ~/.salsarc file and assigned
 # to the SALSA_TOKEN variable:
 #
 #   SALSA_TOKEN="BjDg5RQoRKej738MexCF"
@@ -32,7 +33,7 @@ check_return_code() {
     fi
 }
 
-. ~/.salsarc
+test -n "$SALSA_TOKEN" || . ~/.salsarc
 
 PACKAGE=$1
 



View it on GitLab: https://salsa.debian.org/java-team/pkg-java-scripts/commit/cb4ebbaf7c4e51013ffff2bd8a2c50901e7bee46

-- 
View it on GitLab: https://salsa.debian.org/java-team/pkg-java-scripts/commit/cb4ebbaf7c4e51013ffff2bd8a2c50901e7bee46
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180624/37915044/attachment.html>