Renames the summary field to description (PackageData struc). Added a

	* components/services/install/command-line/eazel-alt-install-corba.c:
	(eazel_install_progress_signal), (main):
	* components/services/install/command-line/eazel-package-query.c:
	(main):
	* components/services/install/command-line/eazel-revert.c:
	(eazel_install_progress_signal):
	* components/services/install/idl/trilobite-eazel-install.idl:
	* components/services/install/lib/eazel-install-corba-types.c:
	(corba_packagedatastruct_from_packagedata),
	(packagedata_from_corba_packagedatastruct):
	* components/services/install/lib/eazel-install-object.c:
	(eazel_install_revert_transaction_from_xmlstring),
	(eazel_install_revert_transaction_from_file):
	* components/services/install/lib/eazel-install-public.h:
	* components/services/install/lib/eazel-install-rpm-glue.c:
	(download_all_packages), (eazel_uninstall_globber):
	* components/services/install/lib/eazel-install-tests.c:
	(dump_package_list):
	* components/services/install/lib/eazel-install-types.c:
	(categorydata_new), (packagedata_new),
	(packagedata_fill_from_rpm_header), (packagedata_destroy_foreach):
	* components/services/install/lib/eazel-install-types.h:
	* components/services/install/lib/eazel-install-xml-package-list.c:
	(parse_package), (eazel_install_packagedata_to_xml),
	(osd_parse_softpkg):
	Renames the summary field to description (PackageData
	struc). Added a revert_transaction_from_file, which reads the xml
	file. Fixed some const issues.

	* nautilus-installer/src/callbacks.c:
	* nautilus-installer/src/installer.c: (eazel_install_progress),
	(eazel_install_preflight), (make_dirs), (check_system),
	(revert_nautilus_install), (installer):
	* nautilus-installer/src/interface.c: (create_what_to_do_page),
	(create_install_page), (create_finish_page):
	* nautilus-installer/src/link.sh:
	* nautilus-installer/src/main.c: (main):
	* nautilus-installer/src/prescript:
	Added GPL license to all the bootstrap installer code. Inserted a
	textbox into the installer, that
	displays current action/package description during download. It
	now also checks linux distro and for a helix install.

6 files changed, 222 insertions, 51 deletions

diff --git a/nautilus-installer/src/callbacks.c b/nautilus-installer/src/callbacks.c
index c46040f51..e24b88d05 100644
--- a/nautilus-installer/src/callbacks.c
+++ b/nautilus-installer/src/callbacks.c
@@ -1,3 +1,25 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* 
+ * Copyright (C) 2000 Eazel, Inc
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Eskil Heyn Olsen  <eskil@eazel.com>
+ */
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
diff --git a/nautilus-installer/src/installer.c b/nautilus-installer/src/installer.c
index 9a9b24c87..d3ffc6d5c 100644
--- a/nautilus-installer/src/installer.c
+++ b/nautilus-installer/src/installer.c
@@ -1,3 +1,25 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* 
+ * Copyright (C) 2000 Eazel, Inc
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Eskil Heyn Olsen  <eskil@eazel.com>
+ */
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif
@@ -12,6 +34,7 @@
 #include <sys/types.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <dirent.h>
 
 #include <sys/utsname.h>
 
@@ -46,7 +69,7 @@ eazel_install_progress (EazelInstall *service,
 			GtkWidget *widget) 
 {
 	GtkProgressBar *progressbar, *progress_overall;
-	GtkText *summary;
+	GtkWidget *summary;
 	GtkLabel *package_label;
 
 	package_label = gtk_object_get_data (GTK_OBJECT (widget), "package_label");
@@ -62,9 +85,15 @@ eazel_install_progress (EazelInstall *service,
 
 		gtk_progress_set_format_string (GTK_PROGRESS (progressbar), "%p%% (%v of %u kb)");
 		gtk_progress_configure (GTK_PROGRESS (progressbar), 0, 0, (float)(total/1024));		
-		gtk_text_backward_delete (summary, gtk_text_get_length (summary));
-		gtk_text_insert (summary, NULL, NULL, NULL,
-				 package->summary, strlen (package->summary));
+#ifdef NO_TEXT_BOX
+		gtk_label_set_text (GTK_LABEL (summary), package->description);
+#else
+		gtk_text_backward_delete (GTK_TEXT (summary), 
+					  gtk_text_get_length (GTK_TEXT (summary)));
+		gtk_text_insert (GTK_TEXT (summary), 
+				 NULL, NULL, NULL,
+				 package->description, strlen (package->summary));
+#endif
 			
 	}
 
@@ -234,7 +263,7 @@ eazel_install_preflight (EazelInstall *service,
 {
 	GtkProgressBar *progress_overall;
 	GtkLabel *package_label;
-	GtkText *summary;
+	GtkWidget *summary;
 	char *summary_string;
 	char *tmp;
 
@@ -257,9 +286,15 @@ eazel_install_preflight (EazelInstall *service,
 	}
 
 	gtk_label_set_text (package_label, tmp);
-	gtk_text_backward_delete (summary, gtk_text_get_length (summary));
-	gtk_text_insert (summary, NULL, NULL, NULL,
+#ifdef NO_TEXT_BOX
+	gtk_label_set_text (GTK_LABEL (summary), summary_string);
+#else
+	gtk_text_backward_delete (GTK_TEXT (summary), 
+				  gtk_text_get_length (GTK_TEXT (summary)));
+	gtk_text_insert (GTK_TEXT (summary), 
+			 NULL, NULL, NULL,
 			 summary_string, strlen (summary_string));
+#endif
 	g_main_iteration (FALSE);
 }
 
@@ -307,7 +342,8 @@ make_dirs ()
 			retval = mkdir (EAZEL_SERVICES_DIR_HOME, 0755);		       
 			if (retval < 0) {
 				if (errno != EEXIST) {
-					g_error (_("*** Could not create services directory (%s)! ***\n"), EAZEL_SERVICES_DIR_HOME);
+					g_error (_("*** Could not create services directory (%s)! ***\n"), 
+						 EAZEL_SERVICES_DIR_HOME);
 				}
 			}
 		}
@@ -315,24 +351,20 @@ make_dirs ()
 		retval = mkdir (EAZEL_SERVICES_DIR, 0755);
 		if (retval < 0) {
 			if (errno != EEXIST) {
-				g_error (_("*** Could not create services directory (%s)! ***\n"), EAZEL_SERVICES_DIR);
+				g_error (_("*** Could not create services directory (%s)! ***\n"), 
+					 EAZEL_SERVICES_DIR);
 			}
 		}
 	}
 }
 
-void installer (GtkWidget *window,
-		gint method) 
+void
+check_system (GtkWidget *window)
 {
-	EazelInstall *service;
-	GtkProgressBar *progressbar;
-	GtkLabel *package_label;
-	GtkLabel *action_label;
+	DistributionInfo dist;
+
+	dist = trilobite_get_distribution ();
 
-	if (method==UPGRADE) {
-		gnome_warning_dialog ("We don't do UPGRADE yet");
-		return;
-	}
 #ifndef NAUTILUS_INSTALLER_RELEASE
 	if (!installer_test) {
 		GnomeDialog *d;
@@ -343,6 +375,61 @@ void installer (GtkWidget *window,
 		gnome_dialog_run_and_close (d);
 	} 
 #endif
+
+	g_message ("checking for rehat");
+	if (dist.name != DISTRO_REDHAT) {
+		GnomeDialog *d;
+		d = GNOME_DIALOG (gnome_warning_dialog_parented (_("This preview installer only works\n"
+								   "for RPM based systems. You will have\n"
+								   "to download the source yourself."),
+								 GTK_WINDOW (window)));
+		gnome_dialog_run_and_close (d);
+		exit (1);
+	}
+
+	if (!g_file_test ("/etc/pam.d/helix-update", G_FILE_TEST_ISFILE)) {
+		GnomeDialog *d;
+		d = GNOME_DIALOG (gnome_warning_dialog_parented (_("You do not have HelixCode gnome installed.\n"
+								   "This means I will install the required parts\n"
+								   "for you, but you might want to abort the\n"
+								   "installer and go to http://www.helixcode.com\n"
+								   "and download the full HelixCode Gnome\n"
+								   "installation"),
+								 GTK_WINDOW (window)));
+		gnome_dialog_run_and_close (d);
+	}
+}
+
+void
+revert_nautilus_install (EazelInstall *service)
+{
+	DIR *dirent;
+	struct dirent *de;
+
+	dirent = opendir (EAZEL_SERVICES_DIR);
+	
+	while (de = readdir (dirent)) {
+		if (strncmp (de->d_name, "transaction.", 12)==0) {
+			eazel_install_revert_transaction_from_file (service, de->d_name);
+			unlink (de->d_name);
+		}
+	}
+}
+
+void installer (GtkWidget *window,
+		gint method) 
+{
+	EazelInstall *service;
+	GtkWidget *druid;
+/*
+	GtkProgressBar *progressbar;
+	GtkLabel *package_label;
+	GtkLabel *action_label;
+*/
+	if (method==UPGRADE) {
+		gnome_warning_dialog ("We don't do UPGRADE yet");
+		return;
+	}
 	
 	/* We set force, update and downgrade to true. */
 	service = EAZEL_INSTALL (gtk_object_new (TYPE_EAZEL_INSTALL,
@@ -362,6 +449,7 @@ void installer (GtkWidget *window,
 						 "package_list", installer_local, 
 						 "package_list_storage_path", package_list [ method ],
 						 "server_port", PORT_NUMBER,
+						 "transaction_dir", EAZEL_SERVICES_DIR,
 						 NULL));
 	g_assert (service != NULL);
 
@@ -390,20 +478,36 @@ void installer (GtkWidget *window,
 	case FULL_INST:
 	case NAUTILUS_ONLY:
 	case SERVICES_ONLY:
-	case UPGRADE:		
 		eazel_install_install_packages (service, NULL);
 		break;
+	case UPGRADE:	
+	{
+		GList *categories;
+		CategoryData *cat;
+		PackageData *pack;
+
+		cat = categorydata_new ();
+		pack = packagedata_new ();
+		pack->name = g_strdup ("nautilus");
+		pack->distribution = trilobite_get_distribution ();
+		cat->packages = g_list_prepend (NULL, pack);
+		categories = g_list_prepend (NULL, cat);
+		eazel_install_install_packages (service, categories);
+	}
+	break;
 	case UNINSTALL:
-		eazel_install_uninstall_packages (service, NULL);
+		revert_nautilus_install (service);
 		break;
 	};
 
 	gtk_object_destroy (GTK_OBJECT (service)); 
 
+/*
 	progressbar = gtk_object_get_data (GTK_OBJECT (window), "progressbar_single");
 	gtk_progress_set_format_string (GTK_PROGRESS (progressbar), "done");
 	progressbar = gtk_object_get_data (GTK_OBJECT (window), "progressbar_overall");
 	gtk_progress_set_format_string (GTK_PROGRESS (progressbar), "done");
+*/
 
 	if (failure_info && strlen (failure_info)>1) {
 		if (installer_debug) {
diff --git a/nautilus-installer/src/interface.c b/nautilus-installer/src/interface.c
index 0ecd35f42..b965fc613 100644
--- a/nautilus-installer/src/interface.c
+++ b/nautilus-installer/src/interface.c
@@ -1,3 +1,24 @@
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* 
+ * Copyright (C) 2000 Eazel, Inc
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Eskil Heyn Olsen  <eskil@eazel.com>
+ */
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
@@ -85,7 +106,7 @@ create_what_to_do_page (GtkWidget *druid, GtkWidget *window)
 	gtk_widget_show (fixed3);
 	gtk_box_pack_start (GTK_BOX (vbox3), fixed3, TRUE, TRUE, 0);
 
-	fullbutton = gtk_radio_button_new_with_label (fixed3_group, _("Most recent build"));
+	fullbutton = gtk_radio_button_new_with_label (fixed3_group, _("Most Recent Build"));
 	fixed3_group = gtk_radio_button_group (GTK_RADIO_BUTTON (fullbutton));
 	gtk_widget_set_name (fullbutton, "fullbutton");
 	gtk_widget_ref (fullbutton);
@@ -106,6 +127,7 @@ create_what_to_do_page (GtkWidget *druid, GtkWidget *window)
 	gtk_fixed_put (GTK_FIXED (fixed3), nautilus_only_button, 72, 56);
 	gtk_widget_set_uposition (nautilus_only_button, 72, 56);
 	gtk_widget_set_usize (nautilus_only_button, 0, 0);
+
 /*
 	services_only_button = gtk_radio_button_new_with_label (fixed3_group, _("*"));
 	fixed3_group = gtk_radio_button_group (GTK_RADIO_BUTTON (services_only_button));
@@ -118,8 +140,9 @@ create_what_to_do_page (GtkWidget *druid, GtkWidget *window)
 	gtk_widget_set_uposition (services_only_button, 72, 88);
 	gtk_widget_set_usize (services_only_button, 0, 0);
 	gtk_widget_set_sensitive (GTK_WIDGET (services_only_button), FALSE);
+*/
 
-	upgrade_button = gtk_radio_button_new_with_label (fixed3_group, _("*"));
+	upgrade_button = gtk_radio_button_new_with_label (fixed3_group, _("Latest RPM Build"));
 	fixed3_group = gtk_radio_button_group (GTK_RADIO_BUTTON (upgrade_button));
 	gtk_widget_set_name (upgrade_button, "upgrade_button");
 	gtk_widget_ref (upgrade_button);
@@ -129,9 +152,8 @@ create_what_to_do_page (GtkWidget *druid, GtkWidget *window)
 	gtk_fixed_put (GTK_FIXED (fixed3), upgrade_button, 72, 120);
 	gtk_widget_set_uposition (upgrade_button, 72, 120);
 	gtk_widget_set_usize (upgrade_button, 0, 0);
-	gtk_widget_set_sensitive (GTK_WIDGET (upgrade_button), FALSE);
-*/
-	uninstall_button = gtk_radio_button_new_with_label (fixed3_group, _("Uninstall"));
+
+	uninstall_button = gtk_radio_button_new_with_label (fixed3_group, _("Uninstall Nautilus"));
 	fixed3_group = gtk_radio_button_group (GTK_RADIO_BUTTON (uninstall_button));
 	gtk_widget_set_name (uninstall_button, "uninstall_button");
 	gtk_widget_ref (uninstall_button);
@@ -141,8 +163,7 @@ create_what_to_do_page (GtkWidget *druid, GtkWidget *window)
 	gtk_fixed_put (GTK_FIXED (fixed3), uninstall_button, 72, 152);
 	gtk_widget_set_uposition (uninstall_button, 72, 152);
 	gtk_widget_set_usize (uninstall_button, 0, 0);
-	gtk_widget_set_sensitive (GTK_WIDGET (uninstall_button), FALSE);
-	
+
 	return what_to_do_page;
 }
 
@@ -196,14 +217,14 @@ create_install_page (GtkWidget *druid, GtkWidget *window)
 				  (GtkDestroyNotify) gtk_widget_unref);
 	gtk_widget_show (druid_vbox2);
 
-	vbox5 = gtk_vbox_new (FALSE, 16);
+	vbox5 = gtk_vbox_new (FALSE, 0);
 	set_white_stuff (GTK_WIDGET (vbox5));
 	gtk_widget_set_name (vbox5, "vbox5");
 	gtk_widget_ref (vbox5);
 	gtk_object_set_data_full (GTK_OBJECT (window), "vbox5", vbox5,
 				  (GtkDestroyNotify) gtk_widget_unref);
 	gtk_widget_show (vbox5);
-	gtk_box_pack_start (GTK_BOX (druid_vbox2), vbox5, FALSE, FALSE, 16);
+	gtk_box_pack_start (GTK_BOX (druid_vbox2), vbox5, TRUE, TRUE, 0);
 
 	table2 = gtk_table_new (3, 2, FALSE);
 	set_white_stuff (GTK_WIDGET (table2));
@@ -212,8 +233,8 @@ create_install_page (GtkWidget *druid, GtkWidget *window)
 	gtk_object_set_data_full (GTK_OBJECT (window), "table2", table2,
 				  (GtkDestroyNotify) gtk_widget_unref);
 	gtk_widget_show (table2);
-	gtk_box_pack_start (GTK_BOX (vbox5), table2, FALSE, TRUE, 16);
 	gtk_table_set_row_spacings (GTK_TABLE (table2), 16);
+	gtk_box_pack_start (GTK_BOX (vbox5), table2, FALSE, FALSE, 16);
 
 	progressbar1 = gtk_progress_bar_new ();
 	gtk_widget_set_name (progressbar1, "progressbar_single");
@@ -234,13 +255,13 @@ create_install_page (GtkWidget *druid, GtkWidget *window)
 				  (GtkDestroyNotify) gtk_widget_unref);
 	gtk_progress_set_format_string (GTK_PROGRESS (progressbar2), "Waiting for download...");
 	gtk_progress_set_show_text (GTK_PROGRESS (progressbar2), TRUE);		  
-	/* gtk_widget_show (progressbar2); */
+	gtk_widget_show (progressbar2); 
 	gtk_table_attach (GTK_TABLE (table2), progressbar2, 1, 2, 2, 3,
 			  /* GTK_EXPAND */ 0,
 			  /* GTK_EXPAND */ GTK_SHRINK,
 			  0, 0);
 
-	package_label = gtk_label_new (_("                                                     "));
+	package_label = gtk_label_new (_("En fjæsing hedder Bent"));
 	gtk_widget_set_name (package_label, "package_label");
 	gtk_widget_ref (package_label);
 	gtk_object_set_data_full (GTK_OBJECT (window), "package_label", package_label,
@@ -250,7 +271,7 @@ create_install_page (GtkWidget *druid, GtkWidget *window)
 			  GTK_EXPAND,
 			  GTK_EXPAND,
 			  0, 0);
-
+/*
 	fixed1 = gtk_fixed_new ();
 	gtk_widget_set_name (fixed1, "fixed1");
 	set_white_stuff (GTK_WIDGET (fixed1));
@@ -259,7 +280,19 @@ create_install_page (GtkWidget *druid, GtkWidget *window)
 				  (GtkDestroyNotify) gtk_widget_unref);
 	gtk_widget_show (fixed1);
 	gtk_box_pack_start (GTK_BOX (vbox5), fixed1, TRUE, TRUE, 16);	
+*/
 
+
+#ifdef NO_TEXT_BOX
+	textbox = gtk_label_new ("");
+	gtk_widget_set_name (textbox, "textbox");
+	gtk_widget_ref (textbox);
+	gtk_object_set_data_full (GTK_OBJECT (window), "summary", textbox,
+				  (GtkDestroyNotify) gtk_widget_unref);
+	gtk_widget_show (textbox);
+	gtk_label_set_text (GTK_LABEL (textbox), download_description);
+	gtk_box_pack_start (GTK_BOX (vbox5), textbox, TRUE, TRUE, 0);	
+#else
 	scrolledwindow = gtk_scrolled_window_new (NULL, NULL);
 	gtk_widget_set_name (scrolledwindow, "scrolledwindow");
 	gtk_widget_ref (scrolledwindow);
@@ -267,11 +300,10 @@ create_install_page (GtkWidget *druid, GtkWidget *window)
 				  (GtkDestroyNotify) gtk_widget_unref);
 	gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow),
 					GTK_POLICY_AUTOMATIC,
-					GTK_POLICY_AUTOMATIC);
+					GTK_POLICY_NEVER);
 	gtk_widget_show (scrolledwindow);
-	gtk_box_pack_start (GTK_BOX (vbox5), scrolledwindow, TRUE, TRUE, 16);	
+	gtk_box_pack_start (GTK_BOX (vbox5), scrolledwindow, TRUE, TRUE, 0);	
     
-
 	textbox = gtk_text_new (NULL, NULL);
 	gtk_widget_set_name (textbox, "summary");
 	gtk_widget_ref (textbox);
@@ -284,7 +316,7 @@ create_install_page (GtkWidget *druid, GtkWidget *window)
 	gtk_widget_show (textbox);
 	gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrolledwindow), 
 					       textbox);
-	
+#endif
 	return install_page;
 }
 
@@ -315,9 +347,7 @@ create_finish_page (GtkWidget *druid, GtkWidget *window)
 	gnome_druid_page_finish_set_title (GNOME_DRUID_PAGE_FINISH (finish_page), _("Finished"));
 	gnome_druid_page_finish_set_text (GNOME_DRUID_PAGE_FINISH (finish_page), 
 					  _("If the installation was successfull, you can\n"
-					    "find the nautilus icon in the applications menu.\n"
-					    "If you restart GMC, you can also use the desktop icon, which\n"
-					    "I'll install when you click \"Finish\".\n\n"
+					    "find the nautilus icon in the applications menu.\n\n"
 					    "Thanks for taking the time to try out Nautilus.\n\n"
 					    "May your life be a healthy and happy one."));
 
diff --git a/nautilus-installer/src/link.sh b/nautilus-installer/src/link.sh
index 749c3d9cb..7021efdb5 100755
--- a/nautilus-installer/src/link.sh
+++ b/nautilus-installer/src/link.sh
@@ -7,7 +7,7 @@ make -f makefile.staticlib
 popd
 
 make clean
-make CFLAGS="-O -Werror $*" LDFLAGS="-static"
+make CFLAGS="-O -Werror -DNO_TEXT_BOX $*" LDFLAGS="-static"
 gcc -static -O -Werror -o nautilus-installer main.o support.o interface.o callbacks.o installer.o \
 ../../components/services/install/lib/libeazelinstall_minimal.a \
 ../../components/services/trilobite/libtrilobite/helixcode-utils.o \
diff --git a/nautilus-installer/src/main.c b/nautilus-installer/src/main.c
index c9b6f71e0..563513982 100644
--- a/nautilus-installer/src/main.c
+++ b/nautilus-installer/src/main.c
@@ -1,6 +1,23 @@
-/*
- * Initial main.c file generated by Glade. Edit as required.
- * Glade will not overwrite this file.
+/* -*- Mode: C; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* 
+ * Copyright (C) 2000 Eazel, Inc
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authors: Eskil Heyn Olsen  <eskil@eazel.com>
  */
 
 #ifdef HAVE_CONFIG_H
@@ -43,6 +60,7 @@ main (int argc, char *argv[])
    */
   window = create_window ();
   set_images (window);
+  check_system (window);
 
   gtk_widget_show (window);
 
diff --git a/nautilus-installer/src/prescript b/nautilus-installer/src/prescript
index 4f7bd0920..e8da00d86 100644
--- a/nautilus-installer/src/prescript
+++ b/nautilus-installer/src/prescript
@@ -5,10 +5,9 @@ if test $UID -ne 0; then
     echo ""
     echo "Nautilus-Installer v 0.2"
     echo ""
-    echo "argle bargle glob glyf muhainapuniua bork bork bork"
-    echo "fisk er dumme og heste er grimme"
-    echo "To maend, gik ud i en skov, tog bukserne af, til de begge"
-    echo "blev flove. Gravballemanden blev min skaebne"
+    echo "Fisk er dumme og heste er grimme"
+    echo "To mænd, gik ud i en skov, tog bukserne af, til de begge"
+    echo "blev flove. Gravballemanden blev min skæbne"
     echo ""
     echo "The Nautilus-Installer requires superuser access to prepare the system"
     echo "It needs to create a few administrative directories on in /var and"
@@ -19,8 +18,6 @@ if test $UID -ne 0; then
     xhost + localhost
     su - -c "export DISPLAY=$DISPLAY && cd $PWD && echo Uncompressing... && sh $0 $* $USER"
     xhost - localhost
-    cp -f /usr/share/gnome/apps/Applications/nautilus.desktop ~/.gnome-desktop/
-    chmod -f 644 ~/.gnome-desktop/nautilus.desktop
     exit
 fi
 if ! test -d /var/eazel/services; then