Made some language cleanup.

diff --git a/build.sh b/build.sh
index c81b0d96822dd6ff4f195367895784ed52de7a83..75ffeef524a85b79f2ef8b0a413ecaecbab1e308 100755 (executable)
--- 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 (file)
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 (file)
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 cbaf1be4ef8bdfe1c22696f573a7b6b169df1fd1..ba657471d989cd941439c9465b3d9fdfde94e2ee 100644 (file)
--- 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