From e4121dde007c66ec9e2f4c9ecb4a94d38c5fa6cc Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Thu, 1 Oct 2015 13:26:03 -0300
Subject: Introduce read_global_var:

- Add a new script, read_global_var, that returns the value of any item
  contained in global array $g
- Replace all grep and sed magic from shell scripts
---
 src/etc/rc.php_ini_setup | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

(limited to 'src/etc/rc.php_ini_setup')

diff --git a/src/etc/rc.php_ini_setup b/src/etc/rc.php_ini_setup
index 2fd5add..b4038e7 100755
--- a/src/etc/rc.php_ini_setup
+++ b/src/etc/rc.php_ini_setup
@@ -76,16 +76,7 @@ fi
 
 # Set upload directory
 if [ "$PLATFORM" = "nanobsd" ]; then
-	globals_inc="/etc/inc/globals.inc"
-	if [ -f /etc/inc/globals_override.inc ]; then
-		globals_inc="/etc/inc/globals_override.inc ${globals_inc}"
-	fi
-	UPLOADTMPDIR=$(cat ${globals_inc} | \
-		grep upload_path | \
-		head -n 1 | \
-		sed 's/^.*=>* *//; s/["\;,]*//g')
-
-	UPLOADTMPDIR=${UPLOADTMPDIR:-"/root"}
+	UPLOADTMPDIR=$(/usr/local/sbin/read_global_var upload_path "/root")
 else
 	UPLOADTMPDIR="/tmp"
 fi
@@ -177,20 +168,8 @@ if [ -z "${TIMEZONE}" ]; then
 fi
 
 if [ -z "${TIMEZONE}" ]; then
-	# Last option, use default value
-	globals_inc="/etc/inc/globals.inc"
-	if [ -f /etc/inc/globals_override.inc ]; then
-		globals_inc="/etc/inc/globals_override.inc ${globals_inc}"
-	fi
-	TIMEZONE=$(cat ${globals_inc} | \
-		grep default_timezone | \
-		head -n 1 | \
-		sed 's/^.*=>* *//; s/["\;,]*//g')
-fi
-
-if [ -z "${TIMEZONE}" ]; then
-	# It it's still blank, lets avoid PHP errors
-	TIMEZONE="Etc/UTC"
+	# Last option, use default value from $g or Etc/UTC
+	TIMEZONE=$(/usr/local/sbin/read_global_var default_timezone "Etc/UTC")
 fi
 
 # Get a loaded module list in the stock php
-- 
cgit v1.1