update I2PCommonBrowser.html

CHANGES.html

@@ -135,7 +135,7 @@
         Add support for building a Debian package.
       </li>
       <li>
-        Start support for building an MSI package.
+        Add support for building an MSI package.
       </li>
     </ul>
     <h2>

CHANGES.md

@@ -4,7 +4,7 @@ Mon, September 5
  - Fix several issues with running on Windows 11
  - Make tunnel nicknames different to avoid double shared tunnels
  - Add support for building a Debian package.
- - Start support for building an MSI package.
+ - Add support for building an MSI package.
 
 Fri, September 2
 ----------------

I2PCommonBrowser.html

@@ -251,7 +251,7 @@
     <span></span>
   </a>
   isWindows
-  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L93" rel="nofollow">
+  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L98" rel="nofollow">
     [src]
   </a>
 </h3>
@@ -280,7 +280,7 @@
     <span></span>
   </a>
   println
-  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L105" rel="nofollow">
+  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L110" rel="nofollow">
     [src]
   </a>
 </h3>
@@ -313,7 +313,7 @@
     <span></span>
   </a>
   logFile
-  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L107" rel="nofollow">
+  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L112" rel="nofollow">
     [src]
   </a>
 </h3>
@@ -342,7 +342,7 @@
     <span></span>
   </a>
   runtimeDirectory
-  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L123" rel="nofollow">
+  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L128" rel="nofollow">
     [src]
   </a>
 </h3>
@@ -377,7 +377,7 @@
     <span></span>
   </a>
   runtimeDirectory
-  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L140" rel="nofollow">
+  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L145" rel="nofollow">
     [src]
   </a>
 </h3>
@@ -410,7 +410,7 @@
     <span></span>
   </a>
   profileDirectory
-  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L187" rel="nofollow">
+  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L192" rel="nofollow">
     [src]
   </a>
 </h3>
@@ -445,7 +445,7 @@
     <span></span>
   </a>
   profileDir
-  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L199" rel="nofollow">
+  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L204" rel="nofollow">
     [src]
   </a>
 </h3>
@@ -480,7 +480,7 @@
     <span></span>
   </a>
   unpackProfile
-  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L205" rel="nofollow">
+  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L210" rel="nofollow">
     [src]
   </a>
 </h3>
@@ -514,7 +514,7 @@
     <span></span>
   </a>
   copyDirectory
-  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L251" rel="nofollow">
+  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L256" rel="nofollow">
     [src]
   </a>
 </h3>
@@ -553,7 +553,7 @@
     <span></span>
   </a>
   copyDirectoryCompatibityMode
-  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L267" rel="nofollow">
+  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L272" rel="nofollow">
     [src]
   </a>
 </h3>
@@ -592,7 +592,7 @@
     <span></span>
   </a>
   copyFile
-  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L276" rel="nofollow">
+  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L281" rel="nofollow">
     [src]
   </a>
 </h3>
@@ -627,7 +627,7 @@
     <span></span>
   </a>
   validateProfileFirstRun
-  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L287" rel="nofollow">
+  <a href="src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L292" rel="nofollow">
     [src]
   </a>
 </h3>

I2PCommonBrowser.md

@@ -46,7 +46,7 @@ package: net.i2p.i2pfirefox
 This method has no parameters.  
 
 
-### isWindows [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L93)
+### isWindows [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L98)
 
 + Description:   
 + Access: private  
@@ -56,7 +56,7 @@ This method has no parameters.
 This method has no parameters.  
 
 
-### println [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L105)
+### println [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L110)
 
 + Description:   
 + Access: public  
@@ -68,7 +68,7 @@ This method has no parameters.
 | line | String |  |  
 
 
-### logFile [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L107)
+### logFile [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L112)
 
 + Description:   
 + Access: private  
@@ -78,7 +78,7 @@ This method has no parameters.
 This method has no parameters.  
 
 
-### runtimeDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L123)
+### runtimeDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L128)
 
 + Description: get the runtime directory creating it if create=true   
 + Access: protected  
@@ -91,7 +91,7 @@ This method has no parameters.
 | override | String |  |  
 
 
-### runtimeDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L140)
+### runtimeDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L145)
 
 + Description: get the correct runtime directory   
 + Access: protected  
@@ -103,7 +103,7 @@ This method has no parameters.
 | override | String |  |  
 
 
-### profileDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L187)
+### profileDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L192)
 
 + Description: get the profile directory creating it if necessary   
 + Access: protected  
@@ -116,7 +116,7 @@ This method has no parameters.
 | browser | String |  |  
 
 
-### profileDir [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L199)
+### profileDir [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L204)
 
 + Description:   
 + Access: protected  
@@ -129,7 +129,7 @@ This method has no parameters.
 | browser | String |  |  
 
 
-### unpackProfile [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L205)
+### unpackProfile [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L210)
 
 + Description:   
 + Access: protected  
@@ -142,7 +142,7 @@ This method has no parameters.
 | base | String |  |  
 
 
-### copyDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L251)
+### copyDirectory [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L256)
 
 + Description:   
 + Access: protected  
@@ -157,7 +157,7 @@ This method has no parameters.
 | base | String |  |  
 
 
-### copyDirectoryCompatibityMode [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L267)
+### copyDirectoryCompatibityMode [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L272)
 
 + Description:   
 + Access: private  
@@ -172,7 +172,7 @@ This method has no parameters.
 | base | String |  |  
 
 
-### copyFile [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L276)
+### copyFile [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L281)
 
 + Description:   
 + Access: private  
@@ -185,7 +185,7 @@ This method has no parameters.
 | destinationFile | File |  |  
 
 
-### validateProfileFirstRun [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L287)
+### validateProfileFirstRun [[src]](src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java#L292)
 
 + Description:   
 + Access: public  

build.xml

@@ -317,7 +317,7 @@ Linux(because the top command will be run and the script will exit).\n\nBoth det
         <delete dir="plugin/eepsite/docroot/torrents/" />
         <!-- get version number -->
         <buildnumber file="scripts/build.number" />
-        <property name="release.number" value="0.0.27" />
+        <property name="release.number" value="0.0.28" />
 
         <!-- make the update xpi2p -->
         <!-- this contains everything except i2ptunnel.config -->

config.sh

@@ -1,6 +1,6 @@
 #! /usr/bin/env sh
 export GITHUB_USER=eyedeekay
 export GITHUB_REPO=i2p.plugins.firefox
-export GITHUB_NAME="Always pass --new-instance to Firefox"
+export GITHUB_NAME="Add support for Debian and Windows packages"
 export GITHUB_DESCRIPTION=$(cat CHANGES.md)
-export GITHUB_TAG=0.0.27
+export GITHUB_TAG=0.0.28

release.sh

@@ -47,9 +47,9 @@ github-release upload --user "${GITHUB_USER}" \
     --repo "${GITHUB_REPO}" \
     --tag "${GITHUB_TAG}" \
     --label "I2P Browser launcher as a Jpackage inside of a Debian package." \
-    --name "i2pbrowser.deb" \
-    --file "i2pbrowser.deb" \
-    --replace  
+    --name "i2pbrowser_${GITHUB_TAG}_.deb" \
+    --file "i2pbrowser_${GITHUB_TAG}_amd64.deb" \
+    --replace
 echo "Uploaded debian zip"
 git pull github --tags
 git push --all

src/java/net/i2p/i2pfirefox/I2PCommonBrowser.java

@@ -57,25 +57,30 @@ public class I2PCommonBrowser {
     File userHomeFile = new File(userHome);
     println("user.dir testing !" + userHomeFile.getAbsolutePath() + ".equals(" +
             userDirFile.getAbsolutePath() + ")");
-    if (!userDirFile.getAbsolutePath().equals(userHomeFile.getAbsolutePath())) {
-      println("user.dir is not inconvenient");
-      if (userDirFile.exists()) {
-        println("user.dir exists");
-        if (userDirFile.isDirectory()) {
-          println("user.dir is a directory");
-          if (userDirFile.canWrite()) {
-            println("user.dir is writable");
-            return;
-          } else {
-            println("user.dir is not writable");
+    if (!userDirFile.getAbsolutePath().contains("Program Files")) {
+      if (!userDirFile.getAbsolutePath().equals(
+              userHomeFile.getAbsolutePath())) {
+        println("user.dir is not inconvenient");
+        if (userDirFile.exists()) {
+          println("user.dir exists");
+          if (userDirFile.isDirectory()) {
+            println("user.dir is a directory");
+            if (userDirFile.canWrite()) {
+              println("user.dir is writable");
+              return;
+            } else {
+              println("user.dir is not writable");
+            }
           }
+          { println("user.dir is not actually a directory"); }
+        } else {
+          println("user.dir does not exist");
         }
-        { println("user.dir is not actually a directory"); }
       } else {
-        println("user.dir does not exist");
+        println("user.dir should not be the same as user.home");
       }
     } else {
-      println("user.dir should not be the same as user.home");
+      println("user.dir cannot run from inside Program Files");
     }
     if (isWindows())
       userHome = new File(userHome, "AppData/Local/I2P").getAbsolutePath();

windows-release.sh

@@ -0,0 +1,15 @@
+#! /usr/bin/env sh
+git pull --all
+. ../i2p.firefox/config.sh
+. ./config.sh
+. "${HOME}/github-release-config.sh"
+ant distclean jar jpackage
+./windows.sh
+github-release upload --user "${GITHUB_USER}" \
+    --repo "${GITHUB_REPO}" \
+    --tag "${GITHUB_TAG}" \
+    --label "I2P Browser launcher as a Jpackage inside of an MSI package." \
+    --name "i2pbrowser_${GITHUB_TAG}.msi" \
+    --file "i2pbrowser_${GITHUB_TAG}.msi" \
+    --replace
+echo "Uploaded Windows MSI package"

windows.sh

@@ -9,6 +9,7 @@ jpackage \
     --win-menu-group "I2P Browser Configurer" \
     --win-shortcut \
     --win-shortcut-prompt \
+    --win-per-user-install \
     --license-file LICENSE.md \
     --name i2pbrowser \
     --app-version "$GITHUB_TAG" \