fonts: ensure wine based browsers all have basic fonts

chrome: add env option to ignore proxy (used for testing, etc..)
William291234 · Nov 12, 2015 · a2f7844 · a2f7844
1 parent a075381
commit a2f7844
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 21 deletions.
diff --git a/browsers/chrome/run.sh b/browsers/chrome/run.sh
@@ -10,4 +10,9 @@ mkdir ~/.config/
 mkdir ~/.config/google-chrome
 touch ~/.config/google-chrome/First\ Run
 
-google-chrome --proxy-server="netcapsule_pywb_1:8080"  "$URL"
+if [ -n "$NO_PROXY" ]; then
+    google-chrome "$URL"
+else
+    google-chrome --proxy-server="netcapsule_pywb_1:8080"  "$URL"
+fi
+
diff --git a/browsers/ie4/Dockerfile b/browsers/ie4/Dockerfile
@@ -3,12 +3,10 @@ FROM netcapsule/base-wine-browser
 USER browser
 WORKDIR /home/browser
 
-COPY ie4wine.tar.gz /home/browser/ie4wine.tar.gz
+ADD ie4wine.tar.gz /home/browser/
 
 COPY proxy.reg /home/browser/proxy.reg
 
-RUN tar xvf /home/browser/ie4wine.tar.gz; mv /home/browser/ie4 /home/browser/.ie4
-
 COPY flux-apps /home/browser/.fluxbox/apps
 RUN sudo chown browser:browser -R /home/browser/.fluxbox
 

diff --git a/browsers/ie4/ie4wine.tar.gz b/browsers/ie4/ie4wine.tar.gz
diff --git a/browsers/ie4/run.sh b/browsers/ie4/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export WINEPREFIX="/home/browser/.ie4"
+export WINEPREFIX="/home/browser/ie4"
 
 wine regedit proxy.reg
 

diff --git a/browsers/ie5.5/Dockerfile b/browsers/ie5.5/Dockerfile
@@ -3,12 +3,10 @@ FROM netcapsule/base-wine-browser
 USER browser
 WORKDIR /home/browser
 
-COPY ie55wine.tar.gz /home/browser/ie55wine.tar.gz
+ADD ie55wine.tar.gz /home/browser/
 
 COPY proxy.reg /home/browser/proxy.reg
 
-RUN tar xvf /home/browser/ie55wine.tar.gz; mv /home/browser/ie55 /home/browser/.ie55
-
 COPY flux-apps /home/browser/.fluxbox/apps
 RUN sudo chown browser:browser -R /home/browser/.fluxbox
 

diff --git a/browsers/ie5.5/ie55wine.tar.gz b/browsers/ie5.5/ie55wine.tar.gz
diff --git a/browsers/ie5.5/run.sh b/browsers/ie5.5/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export WINEPREFIX="/home/browser/.ie55"
+export WINEPREFIX="/home/browser/ie55"
 
 wine regedit proxy.reg
 

diff --git a/browsers/netscape4.8-win/ns48.tar.gz b/browsers/netscape4.8-win/ns48.tar.gz
diff --git a/browsers/safari5/Dockerfile b/browsers/safari5/Dockerfile
@@ -2,12 +2,10 @@ FROM netcapsule/base-wine-browser
 
 WORKDIR /home/browser
 
-COPY safari.tar.gz /home/browser/safari.tar.gz
+ADD safari.tar.gz /home/browser/
 
 COPY proxy.reg /home/browser/proxy.reg
 
-RUN tar xvf /home/browser/safari.tar.gz; mv /home/browser/safari /home/browser/.safari
-
 COPY flux-apps /home/browser/.fluxbox/apps
 RUN sudo chown browser:browser -R /home/browser/.fluxbox
 

diff --git a/browsers/safari5/run.sh b/browsers/safari5/run.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export WINEPREFIX="/home/browser/.safari"
+export WINEPREFIX="/home/browser/safari"
 
 wine regedit proxy.reg
 

diff --git a/browsers/safari5/safari.tar.gz b/browsers/safari5/safari.tar.gz