added check for USE_HTTP_PROXY_FOR_HTTPS

README.md

@@ -1,47 +1,39 @@
-## ProxyMan 
+## ProxyMan [![Gitter chat](https://badges.gitter.im/gitterHQ/gitter.png)](https://gitter.im/proxyman-linux/Lobby)
 
 ### Configuring proxy made so simple on Linux ([releases](https://github.com/himanshub16/ProxyMan/releases/))
 
-(Download [here](https://github.com/himanshub16/ProxyMan/releases/latest/))
 
-#### Usage :
-* Download the [zip from here](https://github.com/himanshub16/ProxyMan/releases/latest).
-* Extract the zip, open the folder in terminal.
-* Enter the following command
-`
-bash main.sh
-`
+v3 is ready with new features, necessary improvements, updates, restructured code and much better experience. :tada: 
 
-![Screenshot](https://raw.githubusercontent.com/himanshub16/ProxyMan/master/screenshot.png)
+## How to use it
+[![asciicast](https://asciinema.org/a/CVha4PPMdjkU7a1XihD9PItrz.png)](https://asciinema.org/a/CVha4PPMdjkU7a1XihD9PItrz)
 
-# FAQ
-* **Why do someone need it?**
+* Download and install with single-step process.
+```./install```
 
-  Because many times, setting up proxy on Linux sucks (esp. authenticated proxies). There are a lot of locations to configure. This tool reduces your effort by setting the proper configuration at the desired place.
+Proxyman is now available in your path. 
+Open a new terminal window and start playing.
 
-* **For which softwares the settings by ProxyMan is effective?**
+* Set proxy
+```proxyman set```
 
-  ProxyMan sets proxy for `apt`, `dnf`, `bashrc`, `npm`, `git`, `dropbox`, `/etc/environment`, `gsettings`. 
+* Save your settings for later use.
+* View your saved configs
+```proxyman configs```
+* Load your previously saved config - say you saved it by the name *point4*. 
+```proxyman load point4```
 
-* **There is some application/location it does not support. Any workaround?**
+## What's new?
+* Saved configs made more organized and works flawlessly.
+* Installation script makes it available in your path. Just call the command `proxyman`, no `cd` to your downloads.
+* Lots of issues got closed.
+* Restructured codebase with better code quality than before - easier to maintain.
 
-  Why not? Everything is possible. Just raise an issue [here](https://github.com/himanshub16/ProxyMan/issues). 
-  If you are a developer, then your contributions are welcome.
 
-* **My distro works like charm. I don't need it.**
+## Why still a release candidate?
+If you find any bugs/edge-cases not taken care of :see_no_evil:, feel free to open an [issue](https://github.com/ProxyMan/issues).
+:smiley:
 
-  It's great that your distro supports everything. However, many disros do not support authenticated proxy settings. 
-  Moreover, there are several apps which don't use system proxy on certain platforms and need their own workaround.
 
-For older version, checkout [branch v1](https://github.com/himanshub16/ProxyMan/tree/v1).
-To download older versions, checkout releases tagged v1.* [here](https://github.com/himanshub16/ProxyMan/releases).
-
-#### What's new in v2?
-* Modular approach. Individual scripts handle individual targets requiring proxy settings.
-* This means, a script can be for a single application/domain can be created and easily integrated with main.sh, without much modifications in main.sh (which was not available in v1).
-* No issues of privileges for individual scripts. Main script is responsible of executing child script with required privileges.
-
-
-NOTE : It does not support PAC proxy using "proxy configuration URL". It is for setting up "manual" proxy.
-
-#### A GUI version is under progress. However, it is not ready. If you like to contribute, you can checkout to the [gui branch](https://github.com/himanshub16/ProxyMan/tree/gui) of this project.
+### DISCLAIMER
+Please don't save your passwords on public machines. Instead use proxyman without providing password and log-in from the browser.

apt.sh

@@ -1,124 +1,80 @@
 #!/bin/bash
-#
-# If you have found some issues, or some feature request :
-# Raise them here : https://github.com/himanshub16/ProxyMan/issues
-#
-# expected command line arguments
-#
-# Created by "Himanshu Shekhar"
-# For ProxyMan "https://github.com/himanshub16/ProxyMan/"
-#
-# convention to be followed across extension made / to be made
-# include this comment section in all plugins to avoid confusions while coding
-#
 # plugin to set "apt" proxy settings for ProxyMan
-#
-# The arguments are given in bash syntax to maintain universality and ease
-# across all UNIX systems.
-# Your language can use it's respective syntax for
-# arguments and comments.
-# If you don't need any particular proxy settings, ignore the variables.
-
-# $#  : number of arguments
-# $1  : http_host
-# if this argument is "unset", proxy settings should be unset.
-
-# $2  : http_port
-# $3  : use_same ; "y" or "n"
-# $4  : use_auth
-# $5  : username ; send empty string if not available
-# $6  : password ; send empty string if not available
-#
-# if use same is yes, then no further arguments are considered
-#
-# $7  : https_host
-# $8  : https_port
-# $9  : ftp_host
-# $10 : ftp_port
+# privileges has to be set by the process which starts this script
 
-# here your code starts
 
-# privileges has to be set by the process which starts this script
+CONF_FILE="/etc/apt/apt.conf"
 
 fix_new_line() {
-    if [[ $(tail -c 1 "$1" | wc --lines ) = 0 ]]; then
+    if [[ $(tail -c 1 "$CONF_FILE" | wc --lines ) = 0 ]]; then
         echo >> "$1"
     fi
 }
 
 list_proxy() {
-	# inefficient way as the file is read twice.. think of some better way
-	echo
-	echo -e "\e[1m APT proxy settings \e[0m"
-	lines="$(cat /etc/apt/apt.conf | grep proxy -i | wc -l)"
-	if [ "$lines" -gt 0 ]; then
-		cat /etc/apt/apt.conf | grep proxy -i | sed -e "s/Acquire//g" -e "s/\:\:/\ /g" -e "s/\;//g"
-	else
-		echo -e "\e[36m None \e[0m"
-	fi
+    # inefficient way as the file is read twice.. think of some better way
+    echo
+    echo "${bold}APT proxy settings : ${normal}"
+    lines="$(cat $CONF_FILE | grep proxy -i | wc -l)"
+    if [ "$lines" -gt 0 ]; then
+        cat "$CONF_FILE" | grep proxy -i | wc -l
+    else
+        echo "${red}None${normal}"
+    fi
 }
 
 unset_proxy() {
-	if [ ! -e "/etc/apt/apt.conf" ]; then
-		return
-	fi
-	if [ "$(cat /etc/apt/apt.conf | grep proxy -i | wc -l)" -gt 0 ]; then
-		sed "/Proxy/d" -i /etc/apt/apt.conf
-	fi
+    if [ ! -e "$CONF_FILE" ]; then
+        return
+    fi
+    if [ "$(cat $CONF_FILE | grep proxy -i | wc -l)" -gt 0 ]; then
+        sed -E "/^Acquire::(.)*::Proxy/d" $CONF_FILE -i
+    fi
 }
 
 set_proxy() {
-	if [ ! -e "/etc/apt/apt.conf" ]; then
-		touch "/etc/apt/apt.conf"
-	fi
-	var=
-	if [ "$4" = "y" ]; then
-		var="$5:$6@"
-	fi
-	echo -n "" > apt_config.tmp
-	if [ "$3" = "y" ]; then
-		newvar="://$var$1:$2"
-		echo "Acquire::Http::Proxy \"http$newvar\";" >> apt_config.tmp
-		echo "Acquire::Https::Proxy \"https$newvar\";" >> apt_config.tmp
-		echo "Acquire::Ftp::Proxy \"ftp$newvar\";" >> apt_config.tmp
-
-    fix_new_line "/etc/apt/apt.conf"
-		cat apt_config.tmp | tee -a /etc/apt/apt.conf > /dev/null
-		rm apt_config.tmp
-		return
+    unset_proxy
+    if [ ! -e "$CONF_FILE" ]; then
+        touch "$CONF_FILE"
+    fi
 
-	elif [ "$3" = "n" ]; then
-		echo "Acquire::Http::Proxy \"http://$var$1:$2\";" >> apt_config.tmp
-		echo "Acquire::Https::Proxy \"https://$var$7:$8\";" >> apt_config.tmp
-		echo "Acquire::Ftp::Proxy \"ftp://$var$9:$10\";" >> apt_config.tmp
+    local stmt=""
+    if [ "$use_auth" = "y" ]; then
+        stmt="${username}:${password}@"
+    fi
 
-		cat apt_config.tmp | tee -a /etc/apt/apt.conf > /dev/null
-		rm apt_config.tmp
-		return
-	fi
+    # caution: do not use / after stmt
+    echo "Acquire::Http::Proxy \"http://${stmt}${http_host}:${http_port}\"" \
+         >> "$CONF_FILE"
+    if [ "$USE_HTTP_PROXY_FOR_HTTPS" = "true" ]; then
+        echo "Acquire::Https::Proxy \"http://${stmt}${https_host}:${https_port}\";" \
+             >> "$CONF_FILE"
+    else 
+        echo "Acquire::Https::Proxy \"https://${stmt}${https_host}:${https_port}\";" \
+             >> "$CONF_FILE"
+    fi
+    echo "Acquire::Ftp::Proxy \"ftp://${stmt}${ftp_host}:${ftp_port}\"" \
+         >> "$CONF_FILE"
 }
 
 
-apt_available="$(which apt)"
-if [ "$apt_available" = "" ]; then
-	exit
+which apt &> /dev/null
+if [ "$?" != 0 ]; then
+    exit
 fi
 
-
 if [ "$#" = 0 ]; then
-	exit
-fi
-
-if [ "$1" = "unset" ]; then
-	# that's what is needed
-	unset_proxy
-	exit
-	# toggle proxy had issues with commenting and uncommenting
-	# dropping the feature currently
-elif [ "$1" = "list" ]; then
-	list_proxy
-	exit
+    exit
 fi
 
-unset_proxy
-set_proxy $1 $2 $3 $4 $5 $6 $7 $8 $9 $10
+what_to_do=$1
+case $what_to_do in
+    set) set_proxy
+         ;;
+    unset) unset_proxy
+           ;;
+    list) list_proxy
+          ;;
+    *)
+          ;;
+esac

bash-zsh.sh

@@ -0,0 +1,27 @@
+#!/bin/bash
+
+which bash &> /dev/null
+first="$?"
+
+which zsh &> /dev/null
+second="$?"
+
+if [ "$#" = 0 ]; then
+    exit
+fi
+
+if [ "$first" = 0 ]; then
+    bash shellrc.sh "$1" "$HOME/.bashrc"
+    if [ ! "$1" = "list" ]; then
+        echo "To activate in current terminal window"
+        echo "run ${bold}source ~/.bashrc${normal}"
+    fi
+fi
+
+if [ "$second" = 0 ]; then
+    bash shellrc.sh "$1" "$HOME/.zshrc"
+    if [ ! "$1" = "list" ]; then
+        echo "To activate in current terminal window"
+        echo "run ${bold}source ~/.zshrc${normal}"
+    fi
+fi