[anjuta] build-basic-autotools: bgo #645695 - install broken, more robust fix

[Sebastien Granjoux <sgranjoux src gnome org>]

commit 8b649d45ed6739fe0561e2ee6ac4f561ab7e8419
Author: Sébastien Granjoux <seb sfo free fr>
Date:   Sat Apr 16 22:05:34 2011 +0200

    build-basic-autotools: bgo #645695 - install broken, more robust fix

 .../anjuta-build-basic-autotools-plugin.ui         |    2 +-
 plugins/build-basic-autotools/plugin.c             |   63 +++++++++++++++-----
 2 files changed, 48 insertions(+), 17 deletions(-)
---
diff --git a/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui b/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
index 2fc914c..6451f5f 100644
--- a/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
+++ b/plugins/build-basic-autotools/anjuta-build-basic-autotools-plugin.ui
@@ -326,7 +326,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBox" id="preferences_combo:text:sudo, su -c:0:build-install-root-command">
+                          <object class="GtkComboBox" id="preferences_combo:text:sudo %s, su -c %q:0:build-install-root-command">
                             <property name="visible">True</property>
                             <property name="model">install_list</property>
                             <property name="active">0</property>
diff --git a/plugins/build-basic-autotools/plugin.c b/plugins/build-basic-autotools/plugin.c
index c7065fd..d7ae64f 100644
--- a/plugins/build-basic-autotools/plugin.c
+++ b/plugins/build-basic-autotools/plugin.c
@@ -72,7 +72,7 @@
 #define BUILD_PREFS_DIALOG "preferences-dialog-build"
 #define BUILD_PREFS_ROOT "preferences-build-container"
 #define INSTALL_ROOT_CHECK "preferences_toggle:bool:0:0:build-install-root"
-#define INSTALL_ROOT_ENTRY "preferences_combo:text:sudo, su -c:0:build-install-root-command"
+#define INSTALL_ROOT_ENTRY "preferences_combo:text:sudo %s, su -c %q:0:build-install-root-command"
 #define PARALLEL_MAKE_CHECK "preferences_toggle:bool:0:0:build-parallel-make"
 #define PARALLEL_MAKE_SPIN "preferences_spin:int:1:0:build-parallel-make-job"
 
@@ -1695,31 +1695,62 @@ build_install_dir (BasicAutotoolsPlugin *plugin, const gchar *dirname,
 	gchar* root = get_root_install_command(plugin);
 	gchar *build_dir = build_dir_from_source (plugin, dirname);
 	BuildProgram *prog;
+	GString *command;
 
-	/* Check if we need to quote the command (only after " -c" argument)
-	 * FIXME: it will be better to use a format string here to know if we need to
-	 * quote the command or not */
-	if ((root != NULL) && (strlen (root) > 3) && (strcmp (root + strlen(root) - 3, " -c") == 0))
+	if ((root != NULL) && (*root != '\0'))
 	{
-		gchar *command = g_shell_quote (CHOOSE_COMMAND (plugin, INSTALL));
-
-		prog = build_program_new_with_command (build_dir,
-			                                   "%s %s",
-	    		                               root,
-	        		                           command);
-		g_free (command);
+		gchar *first = root; 
+		gchar *ptr = root;
+		
+		/* Replace %s or %q by respectively, the install command or the
+		 * quoted install command. % character can be escaped by using two %. */
+		command = g_string_new (NULL);
+		while (*ptr)
+		{
+			if (*ptr++ == '%')
+			{
+				if (*ptr == 's')
+				{
+					/* Not quoted command */
+					g_string_append_len (command, first, ptr - 1 - first);
+					g_string_append (command, CHOOSE_COMMAND (plugin, INSTALL));
+					first = ptr + 1;
+				}
+				else if (*ptr == 'q')
+				{
+					/* quoted command */
+					gchar *quoted;
+					
+					quoted = g_shell_quote (CHOOSE_COMMAND (plugin, INSTALL));
+					g_string_append_len (command, first, ptr - 1 - first);
+					g_string_append (command, quoted);
+					g_free (quoted);
+					first = ptr + 1;
+				}
+				else if (*ptr == '%')
+				{
+					/* escaped % */
+					g_string_append_len (command, first, ptr - 1 - first);
+					first = ptr;
+				}
+				ptr++;
+			}
+		}
+		g_string_append (command, first);
 	}
 	else
 	{
-		prog = build_program_new_with_command (build_dir,
-			                                   "%s %s",
-		                                       root,
-	        		                           CHOOSE_COMMAND (plugin, INSTALL));
+		command = g_string_new (CHOOSE_COMMAND (plugin, INSTALL));
 	}
+
+	prog = build_program_new_with_command (build_dir,
+		                                   "%s",
+        		                           command->str);
 	build_program_set_callback (prog, callback, user_data);	
 	
 	context = build_save_and_execute_command (plugin, prog, TRUE, err);
 	
+	g_string_free (command, TRUE);
 	g_free (build_dir);
 	g_free(root);