# HG changeset patch
# User Myhailo Danylenko <isbear@ukrpost.net>
# Date 1360517141 -7200
# Node ID 5b818c7467ad5fbcb7c49281b3d5fed042ed9a53
# Parent  5052c1200b680090c6a8566a04aad5f6102b466e
Make option names configurable, deb naming scheme change

diff -r 5052c1200b68 -r 5b818c7467ad CMakeLists.txt
--- a/CMakeLists.txt	Sun Feb 10 19:01:35 2013 +0200
+++ b/CMakeLists.txt	Sun Feb 10 19:25:41 2013 +0200
@@ -19,7 +19,11 @@
 set(PROJECT_VERSION "0.0.1")
 
 ## User settable options
- 
+set(OPT_CMD_HEADER          "cmd_header"          CACHE STRING "Name for mcabber option to enable/disable header with command line")
+set(OPT_CMD_HEADER_INLINE   "cmd_header_inline"   CACHE STRING "Name for mcabber option to switch between headline/inline header")
+set(OPT_CMD_REDIRECT_STDERR "cmd_redirect_stderr" CACHE STRING "Name for mcabber option to enable stderr capturing")
+set(OPT_CMD_SHELL           "cmd_shell"           CACHE STRING "Name for mcabber option to specify shell to be used to execute command")
+
 ## Check for build dependencies
 find_package(PkgConfig REQUIRED) 
 pkg_check_modules(GLIB REQUIRED glib-2.0) 
@@ -41,20 +45,20 @@
 set_target_properties(cmd PROPERTIES COMPILE_FLAGS "-Wall")
 
 ## Packaging information
-set(CPACK_PACKAGE_NAME libmcabber-cmd)
+set(CPACK_PACKAGE_NAME mcabber-mod-cmd)
 set(CPACK_PACKAGE_VERSION ${PROJECT_VERSION})
 set(CPACK_PACKAGE_VENDOR "IsBear")
 set(CPACK_PACKAGE_CONTACT "Myhailo Danylenko <isbear@ukrpost.net>")
-set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mcabber module for sending shell commands output to others")
+set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Mcabber module for sending shell command output to buddies")
 set(CPACK_RESOURCE_FILE_LICENSE ${cmd_SOURCE_DIR}/COPYING)
 set(CPACK_SOURCE_GENERATOR TBZ2)
-set(CPACK_GENERATOR DEB CACHE TEXT "Binary package generator, eg DEB, RPM, TGZ, NSIS...")
+set(CPACK_GENERATOR DEB CACHE STRING "Binary package generator, eg DEB, RPM, TGZ, NSIS...")
 set(CPACK_DEBIAN_PACKAGE_SECTION libs)
 find_program(DPKG_EXECUTABLE dpkg)
 if(DPKG_EXECUTABLE)
 	execute_process(COMMAND ${DPKG_EXECUTABLE} --print-architecture OUTPUT_VARIABLE CPACK_DEBIAN_PACKAGE_ARCHITECTURE OUTPUT_STRIP_TRAILING_WHITESPACE)
 else()
-	set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386 CACHE TEXT "Architecture of package")
+	set(CPACK_DEBIAN_PACKAGE_ARCHITECTURE i386 CACHE STRING "Architecture of package")
 endif()
 set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}_${CPACK_PACKAGE_VERSION}_${CPACK_DEBIAN_PACKAGE_ARCHITECTURE}")
 set(CPACK_SOURCE_IGNORE_FILES "/\\\\..*;\\\\.swp;~$;/build/;\\\\.tar\\\\.;\\\\.deb;\\\\.so")
diff -r 5052c1200b68 -r 5b818c7467ad cmd.c
--- a/cmd.c	Sun Feb 10 19:01:35 2013 +0200
+++ b/cmd.c	Sun Feb 10 19:25:41 2013 +0200
@@ -246,7 +246,7 @@
 			
 			close (fd[0]);
 			dup2 (fd[1], STDOUT_FILENO);
-			if (settings_opt_get_int ("cmd_redirect_stderr"))
+			if (settings_opt_get_int ( OPT_CMD_REDIRECT_STDERR ))
 				dup2 (fd[1], STDERR_FILENO);
 			else
 				close (STDERR_FILENO);
@@ -254,7 +254,7 @@
 			close (fd[1]);
 
 			{
-				const char *shell = settings_opt_get ("cmd_shell");
+				const char *shell = settings_opt_get ( OPT_CMD_SHELL );
 				if (!shell)
 					shell = getenv ("SHELL");
 				if (!shell)
@@ -294,8 +294,8 @@
 		{
 			cmd_cb_t *cb = g_slice_new (cmd_cb_t);
 
-			if (settings_opt_get_int ("cmd_header")) {
-				if (settings_opt_get_int ("cmd_header_inline") || is_room (jid)) {
+			if (settings_opt_get_int ( OPT_CMD_HEADER )) {
+				if (settings_opt_get_int ( OPT_CMD_HEADER_INLINE ) || is_room (jid)) {
 					gchar *mesg = g_strdup_printf ("$ %s", arg);
 					gchar *utf  = to_utf8 (mesg);
 					g_free (mesg);
diff -r 5052c1200b68 -r 5b818c7467ad config.h.in
--- a/config.h.in	Sun Feb 10 19:01:35 2013 +0200
+++ b/config.h.in	Sun Feb 10 19:25:41 2013 +0200
@@ -4,5 +4,10 @@
 
 #define PROJECT_VERSION ( "${PROJECT_VERSION}" )
 
+#define OPT_CMD_HEADER          "${OPT_CMD_HEADER}"
+#define OPT_CMD_HEADER_INLINE   "${OPT_CMD_HEADER_INLINE}"
+#define OPT_CMD_REDIRECT_STDERR "${OPT_CMD_REDIRECT_STDERR}"
+#define OPT_CMD_SHELL           "${OPT_CMD_SHELL}"
+
 #endif