From 6d7a7140750bded0875cce1c34c3ad82bf2f4ff1 Mon Sep 17 00:00:00 2001
From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Tue, 13 Dec 2022 21:35:49 +0100
Subject: [PATCH] Delete NB_AUTH env to local auth in nb_api, change
 SHELL_REPLACE command for it

---
 etc/profile.d/nb.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/etc/profile.d/nb.sh b/etc/profile.d/nb.sh
index 78c15841..58f291ed 100644
--- a/etc/profile.d/nb.sh
+++ b/etc/profile.d/nb.sh
@@ -1,8 +1,4 @@
 export NB_DB=nb
-#NB_AUTH=$(awk '/^machine api.nbdom.net / { print $4":"$6}' $HOME/.netrc 2> /dev/null)
-#=SHELL_REPLACE sudo awk -F '}' '/CLEARTEXT/{print "NB_AUTH=\"nb:"$2"\""}' /etc/ldap/nbdom.net/auth/nb.ldif
-[ -z "$NB_AUTH" ] && NB_AUTH="nb:0TXARcQUpjHZctoROA2X.weWSZKM5DGT"
-export NB_AUTH
 
 nb_repos_commit_push() {
 	shell_help "Commit each repos whith a comment" "$@" && return
@@ -89,11 +85,13 @@ nb_php() {
 
 nb_api() {
 	local uri="$1"; shift
+  local auth=""
+  #=SHELL_REPLACE echo ssh root@ldap.nbdom.net grep CLEARTEXT /etc/ldap/nbdom.net/auth/nb.ldif | awk -F '}' '{print "NB_AUTH=\"nb:"$2"\""}'
 
-	if [ -n "$NB_AUTH" -a x = x$(awk '/^machine api.nbdom.net / { print $4":"$6}' $HOME/.netrc 2> /dev/null) ]; then
-#echo $NB_AUTH 1>&2
-# NB 16.01.19 	if [ -z "$NB_AUTH" -o x = x$(awk '/^machine api.nbdom.net / { print $4":"$6}' $HOME/.netrc 2> /dev/null) ]; then
-		curl -sfS -u "$NB_AUTH" "https://api.nbdom.net$uri" "$@"
+  [ -z "$auth" ] && auth="nb:0TXARcQUpjHZctoROA2X.weWSZKM5DGT"
+
+	if [ -n "$auth" -a x = x$(awk '/^machine api.nbdom.net / { print $4":"$6}' $HOME/.netrc 2> /dev/null) ]; then
+		curl -sfS -u "$auth" "https://api.nbdom.net$uri" "$@"
 	else
 		curl -sfS --netrc-optional "https://api.nbdom.net$uri" "$@"
 	fi
-- 
2.47.3