From 940b5ab731e96de8a3fc2876ed6fa2211fa99a10 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Tue, 31 Jul 2018 20:34:58 +0100
Subject: [PATCH] Quote positions
---
src/freedombone-utils-webadmin | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/freedombone-utils-webadmin b/src/freedombone-utils-webadmin
index 53d050289..261ed1bea 100755
--- a/src/freedombone-utils-webadmin
+++ b/src/freedombone-utils-webadmin
@@ -100,7 +100,7 @@ function web_admin_create_users {
fi
ADMIN_USER=$(get_completion_param "Admin user")
- cp "$webadmin_install_dir/users_template.html" "$users_file"
+ cp "$webadmin_install_dir"/users_template.html "$users_file"
sed -i '/users list/,/end of users/d' "$users_file"
sed -i '/<\/body>/d' "$users_file"
sed -i '/<\/html>/d' "$users_file"
@@ -137,7 +137,7 @@ function web_admin_create_users {
echo ' </a>';
echo ' </div>'; } >> "$users_file"
- cp "$webadmin_install_dir/userprofile.html" "$userfile"
+ cp "$webadmin_install_dir"/userprofile.html "$userfile"
sed -i "s|USERNAME|${USERNAME}|g" "$userfile"
if [[ "$USERNAME" == "$ADMIN_USER" ]]; then
sed -i "s|USERTYPE|Admin|g" "$userfile"
@@ -532,12 +532,12 @@ function web_admin_setup_login {
# create a setup page with the initial password inserted
# and copy it to the index
- cp "$webadmin_install_dir/index.html" "$webadmin_install_dir/index.prev"
- cp "$webadmin_install_dir/setup.html" "$webadmin_install_dir/setup.prev"
- cp "$webadmin_install_dir/setup_confirm_template.html" "$webadmin_install_dir/setup_confirm.html"
+ cp "$webadmin_install_dir"/index.html "$webadmin_install_dir"/index.prev
+ cp "$webadmin_install_dir"/setup.html "$webadmin_install_dir"/setup.prev
+ cp "$webadmin_install_dir"/setup_confirm_template.html "$webadmin_install_dir"/setup_confirm.html
sed -i "s|WEBADMINPASSWORD|${webadmin_password}|g" "$webadmin_install_dir/setup.prev"
sed -i "s|WEBADMINPASSWORD|${webadmin_password}|g" "$webadmin_install_dir/setup_confirm.html"
- cp "$webadmin_install_dir/setup.prev" "$webadmin_install_dir/index.html"
+ cp "$webadmin_install_dir"/setup.prev "$webadmin_install_dir"/index.html
# if initial setup has not yet happened then create
# a password file
@@ -582,7 +582,7 @@ function install_web_admin {
if [ -f "$webadmin_install_dir/setup.prev" ]; then
# We are still waiting for initial setup to happen
- cp "$webadmin_install_dir/setup.prev" "$webadmin_install_dir/index.html"
+ cp "$webadmin_install_dir"/setup.prev "$webadmin_install_dir"/index.html
fi
# if this is an onion only install then modify some php scripts
--
GitLab