use function in install script

7 years ago · 61ec7723f6
parent 9c136a5579
commit 61ec7723f6
1 changed files with 2 additions and 3 deletions
--- a/install/basic-install.sh
+++ b/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