[or-cvs] r16200: Updated fsscript for some recent changes. Also added a "firs (in incognito/trunk: . root_overlay/usr/sbin)

[anonym@xxxxxxxx]

Author: anonym
Date: 2008-07-25 10:09:05 -0400 (Fri, 25 Jul 2008)
New Revision: 16200

Added:
   incognito/trunk/root_overlay/usr/sbin/first-run
Modified:
   incognito/trunk/fsscript.sh
Log:
Updated fsscript for some recent changes.
Also added a "first run" script which will open the walkthrough on the first startup ("first" is only relevant for USB).


Modified: incognito/trunk/fsscript.sh
===================================================================
--- incognito/trunk/fsscript.sh	2008-07-25 14:05:53 UTC (rev 16199)
+++ incognito/trunk/fsscript.sh	2008-07-25 14:09:05 UTC (rev 16200)
@@ -21,8 +21,8 @@
 # Package list
 echo "Generating package list"
 equery -C list > /usr/share/incognito/packages.txt
-/usr/sbin/replace-versions.pl /usr/share/incognito/readme.html > /tmp/readme.html
-mv /tmp/readme.html /usr/share/incognito/readme.html
+/usr/sbin/replace-versions.pl /usr/share/incognito/docs.html > /tmp/docs.html
+mv /tmp/docs.html /usr/share/incognito/docs.html
 
 # Set XSTATICVT to "no" so it will start late
 sed -i \
@@ -89,18 +89,18 @@
 	if [[ -d /usr/kde ]]; then
 		echo "Configuring KDE"
 		mkdir -p $USERDIR/.kde3.5/share/config
-		cp -a /var/lib/kdesession/* $USERDIR/.kde3.5/share/config
-		sed -i s/User=/User=${USERNAME}/ $USERDIR/.kde3.5/share/config/torkrc
-		sed -i s/_USER_/${USERNAME}/ $USERDIR/.kde3.5/share/config/ksmserverrc
-		mkdir -p $USERDIR/.kde3.5/share/apps/konqueror
-		mv $USERDIR/.kde3.5/share/config/bookmarks.xml $USERDIR/.kde3.5/share/apps/konqueror/
+		ln -s $USERDIR/.kde3.5 $USERDIR/.kde
+		mkdir -p $USERDIR/.kde/Autostart
+		cp -a /var/lib/kdesession/* $USERDIR/.kde/share/config
+		sed -i s/User=/User=${USERNAME}/ $USERDIR/.kde/share/config/torkrc
+		sed -i s/_USER_/${USERNAME}/ $USERDIR/.kde/share/config/ksmserverrc
 
 		[[ -x /usr/kde/3.5/bin/knetworkmanager ]] && KNETNM="/usr/kde/3.5/bin/knetworkmanager"
 		[[ -x /usr/bin/knetworkmanager ]] && KNETNM="/usr/bin/knetworkmanager"
 		if [[ -n "${KNETNM}" ]]; then
 			echo "Adding knetworkmanager to KDE autostart"
-			mkdir -p $USERDIR/.kde3.5/Autostart
-			ln -s "${KNETNM}" $USERDIR/.kde3.5/Autostart
+			mkdir -p $USERDIR/.kde/Autostart
+			ln -s "${KNETNM}" $USERDIR/.kde/Autostart
 		fi
 	fi
 
@@ -111,7 +111,7 @@
 		su ${USERNAME} -c "mkdir ~/.fluxbox"
 		cat > ${USERDIR}/.fluxbox/usermenu <<EOF
 [exec] (Create USB) {sudo /usr/sbin/create-usb}
-[exec] (${INCOGNITO:-Incognito} Documentation) {${BROWSER} /usr/share/incognito/readme.html}
+[exec] (${INCOGNITO:-Incognito} Documentation) {${BROWSER} /usr/share/incognito/docs.html}
 EOF
 		su ${USERNAME} -c "/usr/bin/fluxbox-generate_menu -k -B -d /usr/share/applications -ds -is -t xterm -w www.torproject.org -b ${BROWSER} -m \"${INCOGNITO:-Incognito}\" -q /usr/kde/3.5"
 		cat > ${USERDIR}/.fluxbox/startup <<EOF
@@ -132,7 +132,7 @@
 	# Desktop files
 	echo "Preparing desktop"
 	mkdir ${USERDIR}/Desktop
-	for DESKTOP in /usr/share/applications/create-usb.desktop /usr/share/applications/readme.desktop; do
+	for DESKTOP in /usr/share/applications/create-usb.desktop /usr/share/applications/docs.desktop /usr/share/applications/walkthrough.desktop; do
 		ln -s "${DESKTOP}" ${USERDIR}/Desktop
 	done
 
@@ -149,27 +149,29 @@
 	# If Vidalia should be used as default Tor GUI controller instead of TorK
 	#if [[ -x /usr/bin/vidalia ]]; then
 	#	echo "Setting Vidalia as the default Tor GUI controller"
-	#	mkdir -p $USERDIR/.kde3.5/Autostart
-	#	ln -s "/usr/bin/vidalia" $USERDIR/.kde3.5/Autostart
+	#	mkdir -p $USERDIR/.kde/Autostart
+	#	ln -s "/usr/bin/vidalia" $USERDIR/.kde/Autostart
 	#fi
 
 	# kvkbd autostart
 	if [[ -x /usr/bin/kvkbd ]]; then
 		echo "Adding kvkbd to KDE autostart"
-		mkdir -p $USERDIR/.kde3.5/Autostart
-		ln -s "/usr/bin/kvkbd" $USERDIR/.kde3.5/Autostart
+		ln -s "/usr/bin/kvkbd" $USERDIR/.kde/Autostart
 	fi                                      
 
 	# XChat config
 	echo "Setting up XChat"
 	cp -a /var/lib/xchat-config ${USERDIR}/.xchat2
 
-	# Firefox config
+	# Firefox config, and setting up first run walkthrough
 	echo "Setting up Firefox"
 	if [[ -x /usr/bin/firefox-bin ]]; then
 		cp -a /var/lib/firefox-config ${USERDIR}/.mozilla
 	fi
-
+	if [[ -x /usr/sbin/first-run ]]; then
+		ln -s /usr/sbin/first-run ${USERDIR}/.kde/Autostart
+	fi
+                                
 	# Thunderbird config
 	echo "Setting up Thunderbird"
 	if [[ -x /usr/bin/thunderbird-bin ]]; then
@@ -254,6 +256,7 @@
 echo "Removing various cruft (.keep, *~ etc.)"
 find /var/db/pkg -name "CONTENTS" | xargs cat | grep "/\.keep" | awk '{print $2}' | xargs rm -f
 find / -regex ".+~" -exec rm -f '{}' \;
+find / -name "svn-commit*" -exec rm -f '{}' \;
 
 #echo "Removing dangling links"
 #symlinks -dr /

Added: incognito/trunk/root_overlay/usr/sbin/first-run
===================================================================
--- incognito/trunk/root_overlay/usr/sbin/first-run	                        (rev 0)
+++ incognito/trunk/root_overlay/usr/sbin/first-run	2008-07-25 14:09:05 UTC (rev 16200)
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+firefox file:///usr/share/incognito/walkthrough/walkthrough.html && \
+rm -f /home/__INCOGNITO_USER__/.kde/Autostart/first-run.sh


Property changes on: incognito/trunk/root_overlay/usr/sbin/first-run
___________________________________________________________________
Name: svn:executable
   + *