From: Marco Zanon <info@marcozanon.com>
Date: Sat, 8 Sep 2012 16:29:13 +0000 (+0000)
Subject: Made some language cleanup.
X-Git-Tag: 0.4~1
X-Git-Url: https://gitweb.marcozanon.com/?a=commitdiff_plain;h=f92d431c700986da82d561ed2ed7b777cc183562;p=single_click_remote_help

Made some language cleanup.
---

diff --git a/build.sh b/build.sh
index c81b0d9..75ffeef 100755
--- a/build.sh
+++ b/build.sh
@@ -4,9 +4,9 @@
 ## Copyright (c) 2012 Marco Zanon <info@marcozanon.com>.
 ## Released under GPLv2 license (see LICENSE for details).
 
-S1=`awk '/^__CONFIGURATION_DIRECTIVES__/ { print NR - 1; exit 0; }' skeleton`
-C=`awk '/^__CONFIGURATION_DIRECTIVES_BELOW__/ { print NR + 1; exit 0; }' config`
-S2=`awk '/^__CONFIGURATION_DIRECTIVES__/ { print NR + 1; exit 0; }' skeleton`
+S1=`awk '/^__CONFIGURATION_PARAMETERS__/ { print NR - 1; exit 0; }' skeleton`
+C=`awk '/^__CONFIGURATION_PARAMETERS_BELOW__/ { print NR + 1; exit 0; }' config`
+S2=`awk '/^__CONFIGURATION_PARAMETERS__/ { print NR + 1; exit 0; }' skeleton`
 head -n $S1 skeleton > single_click_remote_help.sh
 tail -n+$C config.sample >> single_click_remote_help.sh
 tail -n+$S2 skeleton >> single_click_remote_help.sh
diff --git a/config.sample b/config.sample
deleted file mode 100644
index 3d09100..0000000
--- a/config.sample
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-## single_click_remote_help configuration directives
-## Copyright (c) 2012 Marco Zanon <info@marcozanon.com>.
-## Released under GPLv2 license (see LICENSE for details).
-##
-## Configuration directives.
-
-__CONFIGURATION_DIRECTIVES_BELOW__
-INPUT_BOX_TITLE="__YOUR_TEXT_HERE__"
-INPUT_BOX_MESSAGE="__YOUR_TEXT_HERE__"
-LABEL_COLUMN_TITLE="__YOUR_TEXT_HERE__"
-CONNECTIONS[0]="__YOUR_LABEL_HERE__|__YOUR_VNC_SERVER_COMMAND_ARGUMENTS_HERE__"
-CONNECTIONS[1]="__YOUR_LABEL_HERE__|__YOUR_VNC_SERVER_COMMAND_ARGUMENTS_HERE__"
-CLIENT_CONNECTED_MESSAGE="__YOUR_TEXT_HERE__"
-CLIENT_GONE_MESSAGE="__YOUR_TEXT_HERE__"
-WIDTH="500"
-HEIGHT="400"
diff --git a/configuration.sample b/configuration.sample
new file mode 100644
index 0000000..bfafbf5
--- /dev/null
+++ b/configuration.sample
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+## single_click_remote_help configuration parameters
+## Copyright (c) 2012 Marco Zanon <info@marcozanon.com>.
+## Released under GPLv2 license (see LICENSE for details).
+##
+## Configuration parameters.
+
+__CONFIGURATION_PARAMETERS_BELOW__
+INPUT_BOX_TITLE="__YOUR_TEXT_HERE__"
+INPUT_BOX_MESSAGE="__YOUR_TEXT_HERE__"
+LABEL_COLUMN_TITLE="__YOUR_TEXT_HERE__"
+CONNECTIONS[0]="__YOUR_LABEL_HERE__|__YOUR_VNC_SERVER_COMMAND_ARGUMENTS_HERE__"
+CONNECTIONS[1]="__YOUR_LABEL_HERE__|__YOUR_VNC_SERVER_COMMAND_ARGUMENTS_HERE__"
+CLIENT_CONNECTED_MESSAGE="__YOUR_TEXT_HERE__"
+CLIENT_GONE_MESSAGE="__YOUR_TEXT_HERE__"
+WIDTH="500"
+HEIGHT="400"
diff --git a/skeleton b/skeleton
index cbaf1be..ba65747 100644
--- a/skeleton
+++ b/skeleton
@@ -21,7 +21,7 @@
 ## 1. Define constants.
 SINGLE_CLICK_REMOTE_HELP_VERSION="0.x"
 VNC_SERVER="x11vnc-0.9.13_amd64-Linux"
-__CONFIGURATION_DIRECTIVES__
+__CONFIGURATION_PARAMETERS__
 
 ## 2. Evaluate command line arguments.
 if [ -n "$1" ]; then