abolish --i2p and move to update-i2pbrowser instead

Kicksecure · Sep 9, 2019 · ac21f88 · ac21f88
1 parent 188cc1e
commit ac21f88
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/usr/bin/update-i2pbrowser b/usr/bin/update-i2pbrowser
@@ -7,4 +7,13 @@ export SCRIPTNAME="$(basename "$BASH_SOURCE")"
 
 export ICON="/usr/share/icons/anon-icon-pack/tbupdate.ico"
 
-update-torbrowser --i2p "$@"
+export IDENTIFIER="i2pbrowser-downloader"
+export tb_install_folder="i2pb"
+export tb_install_folder_dot=".i2pb"
+export tb_title="i2p Browser"
+export tb_wiki="i2p_Browser"
+export tb_browser_name="i2p-browser"
+export tb_settings_folder="i2pbrowser.d"
+export tb_bin="i2pbrowser"
+
+update-torbrowser "$@"
diff --git a/usr/bin/update-torbrowser b/usr/bin/update-torbrowser
@@ -305,20 +305,6 @@ tb_parse_cmd_options() {
                [ -n "$tb_onion" ] || tb_onion="true"
                shift
                ;;
-           --i2p)
-               ## This option downloads a Tor Browser Bundle to a custom path,
-               ## intended to be used with i2p. It does no modification to the
-               ## browser itself.
-               IDENTIFIER="i2pbrowser-downloader"
-               tb_install_folder="i2pb"
-               tb_install_folder_dot=".i2pb"
-               tb_title="i2p Browser"
-               tb_wiki="i2p_Browser"
-               tb_browser_name="i2p-browser"
-               tb_settings_folder="i2pbrowser.d"
-               tb_bin="i2pbrowser"
-               shift
-               ;;
            --)
                shift
                break