From 9872e2e53dbaae35a98f6e93eb70634961e97064 Mon Sep 17 00:00:00 2001
From: tituspijean <tituspijean@outlook.com>
Date: Sat, 18 Apr 2020 15:33:31 +0200
Subject: [PATCH] [fix] proper path to argon2-cli

---
 scripts/install | 4 ++--
 scripts/upgrade | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/install b/scripts/install
index f99aadb..3427ada 100644
--- a/scripts/install
+++ b/scripts/install
@@ -158,7 +158,7 @@ chown -R $app: $final_path
 pushd $final_path/src
 	exec_as $app $nodejs_path/npm --loglevel=error install node-gyp
 	exec_as $app $nodejs_path/npm --loglevel=error install
-	exec_as $app $nodejs_path/npm --loglevel=error install argon-cli
+	exec_as $app $nodejs_path/npm --loglevel=error install argon2-cli
 	exec_as $app $nodejs_path/npm --loglevel=error audit fix
 popd
 
@@ -177,7 +177,7 @@ echo "ZT_ADDR=localhost:$(</var/lib/zerotier-one/zerotier-one.port)" >> $env_fil
 echo "HTTP_PORT=$port" >> $env_file
 
 # Setup user credentials file
-hashedpassword=$(echo -n "$password" | argon2-cli -e)
+hashedpassword=$(echo -n "$password" | $final_path/src/node_modules/.bin/argon2-cli -e)
 echo "{\"$admin\":{\"name\":\"$admin\",\"pass_set\":true,\"hash\":\"$hashedpassword\"}}" >> "$final_path/src/etc/passwd"
 
 # Store user settings
diff --git a/scripts/upgrade b/scripts/upgrade
index 3e37aa9..d2ad7d3 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -138,7 +138,7 @@ chown -R $app: $final_path
 pushd $final_path/src
 	exec_as $app $nodejs_path/npm --loglevel=error install node-gyp
 	exec_as $app $nodejs_path/npm --loglevel=error install
-	exec_as $app $nodejs_path/npm --loglevel=error install argon-cli
+	exec_as $app $nodejs_path/npm --loglevel=error install argon2-cli
 	exec_as $app $nodejs_path/npm --loglevel=error audit fix
 popd
 
@@ -157,7 +157,7 @@ echo "ZT_ADDR=localhost:$(</var/lib/zerotier-one/zerotier-one.port)" >> $env_fil
 echo "HTTP_PORT=$port" >> $env_file
 
 # Setup user credentials file
-hashedpassword=$(echo -n "$password" | argon2-cli -e)
+hashedpassword=$(echo -n "$password" | $final_path/src/node_modules/argon2-cli -e)
 echo "{\"$admin\":{\"name\":\"$admin\",\"pass_set\":true,\"hash\":\"$hashedpassword\"}}" >> "$final_path/src/etc/passwd"
 
 #=================================================