Find and launch a router if one is not started on Unixes

Makefile

@@ -121,6 +121,7 @@ install:
 	mkdir -p /etc/i2pbrowser \
 		/var/lib/i2pbrowser
 	install -m644 src/unix/i2pbrowserrc /etc/i2pbrowser/i2pbrowserrc
+	install -m644 src/unix/i2pbrowserdebianrc /etc/i2pbrowser/i2pbrowserdebianrc
 	install -m755 build/profile/i2pbrowser.sh /usr/local/bin/i2pbrowser
 	install -m755 build/app-profile/i2pconfig.sh /usr/local/bin/i2pconfig
 	install -m755 src/unix/i2p-config-service-setup.sh /usr/local/bin/i2p-config-service-setup
@@ -136,6 +137,7 @@ uninstall:
 		/etc/i2pbrowser/i2pbrowserrc \
 		/usr/local/bin/i2pbrowser \
 		/usr/local/bin/i2pconfig \
+		/usr/local/bin/i2p-config-service-setup \
 		/usr/share/applications/i2pbrowser.desktop \
 		/usr/share/applications/i2pconfig.desktop
 
@@ -150,7 +152,7 @@ checkinstall:
 		--pkgrelease=1 \
 		--pkgsource="https://i2pgit.org/i2p-hackers/i2p.firefox" \
 		--maintainer="hankhill19580@gmail.com" \
-		--requires="firefox" \
+		--requires="firefox,wget,i2p,i2p-router" \
 		--suggests="i2p,i2p-router,syndie,tor,tsocks" \
 		--nodoc \
 		--deldoc=yes \

src/unix/i2pbrowser.sh

@@ -4,6 +4,10 @@ if [ -f "/etc/i2pbrowser/i2pbrowserrc" ]; then
   . /etc/i2pbrowser/i2pbrowserrc
 fi
 
+if [ ! -z $I2PROUTER ]; then
+  "$I2PROUTER" start
+fi
+
 if [ -z $BROWSING_PROFILE ]; then
   BROWSING_PROFILE="."
 fi

src/unix/i2pbrowserdebianrc

@@ -0,0 +1,17 @@
+
+I2PROUTER=$(which i2prouter)
+
+if [ -z $I2PROUTER ]; then
+  I2PROUTER=/usr/sbin/i2prouter
+fi
+
+if [ ! -f $I2PROUTER ]; then
+  I2PROUTER="$HOME/i2p/i2prouter"
+fi
+
+if [ ! -f $I2PROUTER ]; then
+  I2PROUTER=""
+fi
+
+wget -q -O - "http://localhost:7657" >/dev/null  && I2PROUTER=""
+echo "$I2PROUTER"

src/unix/i2pbrowserrc

@@ -1,4 +1,8 @@
 
+if [ -f /etc/i2pbrowser/i2pbrowserdebianrc ]; then
+  . /etc/i2pbrowser/i2pbrowserdebianrc
+fi
+
 CONFIGURING_PROFILE=$HOME/i2p/firefox/webapps
 BROWSING_PROFILE=$HOME/i2p/firefox/browsing
 ROUTER_CONSOLE="127.0.0.1:7657"

src/unix/i2pconfig.sh

@@ -4,6 +4,10 @@ if [ -f "/etc/i2pbrowser/i2pbrowserrc" ]; then
   . /etc/i2pbrowser/i2pbrowserrc
 fi
 
+if [ ! -z $I2PROUTER ]; then
+  "$I2PROUTER" start
+fi
+
 if [ -f "$HOME/.i2p/router.config" ]; then
   if [ "$0" = "/usr/local/bin/i2pconfig" ]; then
     if ! grep -R 'routerconsole.browser' "$HOME/.i2p/router.config" ; then