use function in install script

PoeBlu · May 2, 2017 · 61ec772 · 61ec772
1 parent 9c136a5
commit 61ec772
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh
@@ -1413,9 +1413,8 @@ main() {
     pw=""
     if [[ $(grep 'WEBPASSWORD' -c /etc/pihole/setupVars.conf) == 0 ]] ; then
         pw=$(tr -dc _A-Z-a-z-0-9 < /dev/urandom | head -c 8)
-        hash=$(echo -n ${pw} | sha256sum | sed 's/\s.*$//' | sha256sum | sed 's/\s.*$//')
-        hash=$(echo -n ${hash} | sha256sum | sed 's/\s.*$//')
-        echo "WEBPASSWORD=$(echo -n ${pw} | sha256sum | sed 's/\s.*$//' | sha256sum | sed 's/\s.*$//')" >> ${setupVars}
+        . /opt/pihole/webpage.sh
+        echo "WEBPASSWORD=$(HashPassword ${1})
     fi
   fi