Changes between Version 1 and Version 2 of UsingWine

Timestamp:

Feb 1, 2008 5:20:15 AM (16 years ago)

Author:

davidf@sjsoft.com

Comment:

rearranged scripts into separate ones per program

UsingWine

@@ -7 +7 @@
 == Running Safari with the WebKit Nightlies ==
 
-This script shows how to launch Safari with the WebKit nightlies. First unzip the WebKit nightly download in a directory parallel to Safari.
+It is possible to launch Safari with the [Nightly Builds WebKit nightlies]. First unzip the WebKit nightly download in a directory parallel to Safari, then use the following scripts (there are scripts included in the WebKit nightlies but they don't work too well under Wine's console)
 
-There are scripts included in the WebKit nightlies but they don't work too well under Wine's console
-
-Note that Drosera does not yet work
-
+=== General Environment setup ===
 {{{
 webkit_dir="`dirname "$0"`"
@@ -19 +16 @@
 export WINEDLLPATH=$WINEDLLPATH:$webkit_dir:$safari_dir
 export WINEPREFIX=~/.wine
+}}}
 
-launch_program=safari_custom_webkit
-[[ "$1" != "" ]] && launch_program="$1"
+=== Launching Safari as-is (builtin webkit) ===
+Set up the above environment, then...
+{{{
+cd "$safari_dir"
+wine Safari.exe
+}}}
 
-# to launch Safari with the builtin webkit
-if [ "$launch_program" == "safari_builtin_webkit" ]
-  then
-    cd "$safari_dir"
-    wine Safari.exe
-  fi
+=== Launching Safari with custom webkit ===
+Set up the above environment, then...
+{{{
+cd "$webkit_dir"
+# copy Safari stuff over WebKit (without replacing newer dlls)
+cp -upv "$safari_dir/Safari.exe" .
+cp -upv "$safari_dir"/*.dll .
+for resource_dir in "$safari_dir"/*.resources
+  do
+    base_resource_dir="`basename "$resource_dir"`"
+    [[ -d "$base_resource_dir" ]] && rm -fr "$base_resource_dir"
+    cp -pr "$resource_dir" .
+  done
+# now actually run
+export PATH="$webkit_dir":"$safari_dir":"$PATH"
+wine Safari.exe /customWebKit
+}}}
 
-# to launch Safari with custom webkit
-if [ "$launch_program" == "safari_custom_webkit" ]
-  then
-    cd "$webkit_dir"
-    cp -upv "$safari_dir/Safari.exe" .
-    cp -upv "$safari_dir"/*.dll .
-    for resource_dir in "$safari_dir"/*.resources
-      do
-        base_resource_dir="`basename "$resource_dir"`"
-        [[ -d "$base_resource_dir" ]] && rm -fr "$base_resource_dir"
-        cp -pr "$resource_dir" .
-      done
-    export PATH="$webkit_dir":"$safari_dir":"$PATH"
-    wine Safari.exe /customWebKit
-  fi
-
-# to launch Drosera
-if [ "$launch_program" == "drosera" ]
-  then
-    cd "$webkit_dir"
-    export PATH="$webkit_dir":"$safari_dir":"$PATH"
-    wine Drosera.exe
-  fi
-
+=== Launching  Drosera ===
+Note that Drosera does not yet work - this is how to try though (after setting up the above environment)...
+{{{
+cd "$webkit_dir"
+export PATH="$webkit_dir":"$safari_dir":"$PATH"
+wine Drosera.exe
 }}}