[patch] fix for hardcoded /usr/bin/bzip2 path

control-center-2.10.0-gnome_bug_170058.patch (text/plain), 1.54 KB, created by Matt Kynx on 2005-03-12 10:07:33 UTC

diff -ur control-center-2.10.0.orig/capplets/theme-switcher/gnome-theme-installer.c control-center-2.10.0/capplets/theme-switcher/gnome-theme-installer.c
--- control-center-2.10.0.orig/capplets/theme-switcher/gnome-theme-installer.c	2005-02-08 22:42:10.000000000 +0000
+++ control-center-2.10.0/capplets/theme-switcher/gnome-theme-installer.c	2005-03-12 16:29:45.000000000 +0000
@@ -176,7 +176,7 @@
 	
 	filename = g_shell_quote(theme_props->filename);
 	/* this should be something more clever and nonblocking */
-	command = g_strdup_printf ("sh -c 'cd \"%s\"; /usr/bin/bzip2 -d -c < \"%s\" | /bin/tar xf - '",
+	command = g_strdup_printf ("sh -c 'cd \"%s\"; /bin/bzip2 -d -c < \"%s\" | /bin/tar xf - '",
 				   theme_props->target_tmp_dir, filename);
 	g_free (filename);
 	if (g_spawn_command_line_sync (command, NULL, NULL, &status, NULL) && status == 0) {
@@ -215,7 +215,7 @@
 		g_free (filename);
 	} else if (path && len > 8 && !strcmp (path + len - 8, ".tar.bz2")) {
 		filename = g_shell_quote (path);
-		command = g_strdup_printf ("sh -c '/usr/bin/bzip2 -d -c < \"%s\" | /bin/tar ft - | head -1'",
+		command = g_strdup_printf ("sh -c '/bin/bzip2 -d -c < \"%s\" | /bin/tar ft - | head -1'",
 					    filename);
 		theme_props->filetype=TARBZ;
 		g_free (filename);
@@ -254,7 +254,7 @@
 	theme_props->filename=g_strdup(path);
 	
 	if (theme_props->filetype == TARBZ ) {
-		if (!g_file_test ("/usr/bin/bzip2", G_FILE_TEST_EXISTS)) {
+		if (!g_file_test ("/bin/bzip2", G_FILE_TEST_EXISTS)) {
 			GtkWidget *dialog;
 				
 			dialog = gtk_message_dialog_new (NULL,