[PC-BSD Commits] r3771 - in pbibuild/modules/firefox3: . kmenu-dir overlay-dir overlay-dir/bin

svn at pcbsd.org svn at pcbsd.org
Tue Apr 7 08:54:30 PDT 2009


Author: kris
Date: 2009-04-07 08:54:30 -0700 (Tue, 07 Apr 2009)
New Revision: 3771

Added:
   pbibuild/modules/firefox3/kmenu-dir/firefox3.sh
   pbibuild/modules/firefox3/overlay-dir/bin/firefox3.sh
Removed:
   pbibuild/modules/firefox3/kmenu-dir/uninstall
   pbibuild/modules/firefox3/overlay-dir/scripts/
Modified:
   pbibuild/modules/firefox3/build.sh
   pbibuild/modules/firefox3/kmenu-dir/firefox
   pbibuild/modules/firefox3/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/firefox3/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh
Log:

Updated FireFox 3 with a new method for setting the default browser. Instead of blinding setting it at install time, use a wraper script to check if the browser is the default when its launched, and prompt the user if they want to make it the default at that time.



Modified: pbibuild/modules/firefox3/build.sh
===================================================================
--- pbibuild/modules/firefox3/build.sh	2009-04-06 19:38:51 UTC (rev 3770)
+++ pbibuild/modules/firefox3/build.sh	2009-04-07 15:54:30 UTC (rev 3771)
@@ -10,9 +10,9 @@
 ##############################################################################
 
 # Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,Firefox${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
-mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
-chmod 755 ${PBIDIR}/scripts/removepbi.sh
+sed -e "s,CHANGEME,Firefox${PORTVER},g" ${PBIDIR}/bin/firefox3.sh > /tmp/sed
+mv /tmp/sed ${PBIDIR}/bin/firefox3.sh
+chmod 755 ${PBIDIR}/bin/firefox3.sh
 
 rm -rf /${PBIDIR}/autolibs/firefox3/extensions/lang*
 

Modified: pbibuild/modules/firefox3/kmenu-dir/firefox
===================================================================
--- pbibuild/modules/firefox3/kmenu-dir/firefox	2009-04-06 19:38:51 UTC (rev 3770)
+++ pbibuild/modules/firefox3/kmenu-dir/firefox	2009-04-07 15:54:30 UTC (rev 3771)
@@ -1,8 +1,8 @@
 ExePath: bin/firefox3
 ExeIcon: share/pixmaps/FireFox-128.png
 ExeDescr: FireFox
-ExeNoDesktop: 0
-ExeNoMenu: 0
+ExeNoDesktop: 1
+ExeNoMenu: 1
 ExeRunRoot: 0
 ExeRunShell: 0
 ExeNotify: 1

Modified: pbibuild/modules/firefox3/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/firefox3/overlay-dir/PBI.FirstRun.sh	2009-04-06 19:38:51 UTC (rev 3770)
+++ pbibuild/modules/firefox3/overlay-dir/PBI.FirstRun.sh	2009-04-07 15:54:30 UTC (rev 3771)
@@ -16,33 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-if [ -e "/usr/local/bin/firefox" ]
-then
-    # Looks like FF is installed, ask if they want to remove the old one
-    ls -al /usr/local/bin/firefox | grep Programs 2>/dev/null
-    if [ "$?" = "0" ]
-    then
-      kdialog --yesno "Firefox is already installed, do you wish to uninstall it?" 
-      if [ "$?" = "0" ]
-      then
-        FF="`ls -al /usr/local/bin/firefox | cut -d '>' -f 2 | cut -d "/" -f 3`"
-        echo $FF | grep Firefox 2>/dev/null
-        if [ "$?" = "0" ]
-        then
-          PBIdelete -remove ${FF}
-          sleep 2
-        else
-          kdialog --sorry "Firefox could not be automatically removed... Please remove it in Add / Remove Programs and try again."
-          return 2
-        fi
-      else
-        kdialog --sorry "Firefox is already installed, it must be uninstalled before loading this PBI"
-        return 2
-      fi
-      
-    else
-      # Could not find a link to PBI folder
-      kdialog --sorry "Firefox is already installed, it must be uninstalled before loading this PBI"
-      return 2
-    fi
-fi 

Modified: pbibuild/modules/firefox3/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/firefox3/overlay-dir/PBI.RemoveScript.sh	2009-04-06 19:38:51 UTC (rev 3770)
+++ pbibuild/modules/firefox3/overlay-dir/PBI.RemoveScript.sh	2009-04-07 15:54:30 UTC (rev 3771)
@@ -7,27 +7,3 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/firefox3
-rm /usr/local/bin/firefox
-
-if [ ! -z "$DISPLAY" ]
-then
- # Ask if we want to remove the user profiles
- kdialog --yesno "Do you want to remove all Firefox user profiles? (This will remove all bookmarks, extensions, themes and settings!)" --title "Remove user profiles"
- if [ "$?" = "0" ]
- then
-  # Get list of users
-  ULIST="`cut -d ':' -f 1 /etc/passwd | grep -v '^#'`"
-  for i in `${ULIST}`
-  do
-   # Find the homedir for this user
-   HOMEDIR="`cat /etc/passwd | grep ^${i}: | cut -d ":" -f 6`"
-
-   # Check if we have a mozilla firefox profile and remove it
-   if [ -e "${HOMEDIR}/.mozilla/firefox" ]
-   then
-    rm -rf ${HOMEDIR}/.mozilla/firefox
-   fi
-  done
- fi
-fi

Modified: pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh	2009-04-06 19:38:51 UTC (rev 3770)
+++ pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh	2009-04-07 15:54:30 UTC (rev 3771)
@@ -23,31 +23,4 @@
   ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
 fi
 
-if [ "$INSTALLMODE" = "GUI" ]
-then
-
-USER="$USERNAME"
-
-  # Ask if we should make this the default browser application for our user
-  kdialog --yesno "Do you want to make Firefox the default browser?" --title "Default browser?"
-  if [ "$?" = "0" ]
-  then
-     su $USER -c /Programs/${PROGDIR}/makedefault.sh
-  fi
-
-else
-
-  # We are installing via text mode, lets set ff3 as the default for kde users
-  USERS="`cut -d ':' -f 1 /etc/passwd | grep -v '^#'`"
-  for i in ${USERS} 
-  do
-     HOMEDIR="`cat /etc/passwd | grep ^${i}: | cut -d ":" -f 6`"
-     if [ -d "${HOMEDIR}/.kde4" -o -d "${HOMEDIR}/.kde" ]
-     then
-       su $i -c /Programs/${PROGDIR}/makedefault.sh
-     fi
-  done
-
-fi
-
-echo "LAUNCHCLOSE: /Programs/bin/firefox3"
+echo "LAUNCHCLOSE: /Programs/bin/firefox3.sh"



More information about the Commits mailing list