[or-cvs] r20404: {torbrowser} This actually properly installs Torbutton. How about them ap (torbrowser/trunk/build-scripts)

[ioerror at seul.org]

Author: ioerror
Date: 2009-08-27 22:24:58 -0400 (Thu, 27 Aug 2009)
New Revision: 20404

Modified:
   torbrowser/trunk/build-scripts/configure-firefox.sh
Log:
This actually properly installs Torbutton. How about them apples.


Modified: torbrowser/trunk/build-scripts/configure-firefox.sh
===================================================================
--- torbrowser/trunk/build-scripts/configure-firefox.sh	2009-08-28 01:02:21 UTC (rev 20403)
+++ torbrowser/trunk/build-scripts/configure-firefox.sh	2009-08-28 02:24:58 UTC (rev 20404)
@@ -6,17 +6,34 @@
 ## 4) Profit!
 ##
 
+# Here's where Make puts us
 STARTDIR="`pwd`";
+# This is the bundle we want to tamper with
 BUNDLE="$1";
 echo "BUNDLE is: $BUNDLE"
-EXTENSION=$2;
 
+# This is the full path to the extension we want to install
+EXTENSION="$STARTDIR/$2";
+
+# Here's a relative path to our custom Firefox
 FIREFOX="./App/firefox/firefox";
-FIREFOX_ARGS="-profile firefox -install-global-extension $EXTENSION";
+# Here's what we think should properly install a plugin
+#FIREFOX_ARGS="-profile default -install-global-extension ";
+FIREFOX_ARGS=" -install-global-extension ";
+
+# Now we'll switch into the bundle we wish to tamper with
 cd "$BUNDLE";
+# Now if we were running the bundle, we'd have our CWD as HOME
 export HOME=$PWD;
-echo "We're now in $PWD"
-echo "Attempting to run: $FIREFOX $FIREFOX_ARGS";
-$FIREFOX $FIREFOX_ARGS;
+echo "We're now in (HOME): $PWD"
+export LDPATH=$HOME/Lib/
+echo "Attemping to properly configure LDPATH..."
+echo $LDPATH
+export LD_LIBRARY_PATH=$HOME/Lib/
+echo "Attemping to properly configure LD_LIBRARY_PATH..."
+
+# Here's where we actually tell firefox to install this extension
+echo "Attempting to run: $FIREFOX $FIREFOX_ARGS $EXTENSION";
+$FIREFOX $FIREFOX_ARGS $EXTENSION;
 echo "Firefox said: $?";
 echo