From 78320ee3a611b414dfd685bf36dfb0553bb2f1e3 Mon Sep 17 00:00:00 2001
From: Treer <treer.git@the-bordello.com>
Date: Mon, 25 Apr 2016 19:00:10 +1000
Subject: add commandline help to util/config

---
 util/config | 40 ++++++++++++++++++++++++++++++++++++++--
 1 file changed, 38 insertions(+), 2 deletions(-)

(limited to 'util/config')

diff --git a/util/config b/util/config
index 9e90eca56..5113bd8ec 100755
--- a/util/config
+++ b/util/config
@@ -7,9 +7,45 @@ require_once('include/cli_startup.php');
 
 cli_startup();
 
-if($argc > 3) {
-	
 
+$helpArgs = getopt('h', array('help'));
+if (count($helpArgs) === 1) {
+	echo <<<'EndOfOutput'
+Gets, sets, or lists site-wide configuration settings.
+
+Usage: util/config 
+       util/config <family>
+       util/config <family> <key>
+       util/config <family> <key> <value>
+
+  util/config
+	Displays all config entries
+
+  util/config <family>
+	Displays all config entries for family (system, database, etc)
+
+  util/config <family> <key>
+	Displays single config entry for the specified family and key
+
+  util/config <family> <key> <value>
+	Set config entry for specified family and key to value and display result
+
+Notes:
+  Setting config entries which are manually set in .htconfig.php may result 
+  in conflict between database settings and the manual startup settings. 
+
+  For channel-specific configuration settings, use util/pconfig
+
+  Details for configuration options can be found at:
+
+EndOfOutput;
+	echo '    ' . App::get_baseurl() . '/help/hidden_configs' . PHP_EOL . PHP_EOL;
+	return;
+}
+
+
+
+if($argc > 3) {
 	set_config($argv[1],$argv[2],$argv[3]);
 	echo "config[{$argv[1]}][{$argv[2]}] = " . printable_config(get_config($argv[1],$argv[2])) . "\n";
 }
-- 
cgit v1.2.3


From f336f38ad505df8cf85cbe7ae9ce3c1d363a1ded Mon Sep 17 00:00:00 2001
From: Treer <treer.git@the-bordello.com>
Date: Mon, 25 Apr 2016 22:09:15 +1000
Subject: improve error message in config and pconfig

---
 util/config | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'util/config')

diff --git a/util/config b/util/config
index 5113bd8ec..d4bcd5da1 100755
--- a/util/config
+++ b/util/config
@@ -3,6 +3,11 @@
 
 // Red config utility
 
+if(!file_exists('include/cli_startup.php')) {
+	echo 'Run config from the top level Hubzilla web directory, as util/config <args>' . PHP_EOL;
+	exit(1);
+}
+
 require_once('include/cli_startup.php');
 
 cli_startup();
-- 
cgit v1.2.3