Fixes binhex/arch-qbittorrentvpn#120

Arch ipcalc doesn't include network anymore:
 $ ipcalc 10.0.0.1 255.255.255.255
Address:   10.0.0.1             00001010.00000000.00000000.00000001
Netmask:   255.255.255.255 = 32 11111111.11111111.11111111.11111111
Wildcard:  0.0.0.0              00000000.00000000.00000000.00000000
=>
Hostroute: 10.0.0.1             00001010.00000000.00000000.00000001
Hosts/Net: 1                     Class A, Private Internet

The redhat package from Aur does.

Author: davidgibbons

build/root/install.sh

@@ -38,11 +38,17 @@ mv /tmp/scripts-master/shell/arch/docker/*.sh /usr/local/bin/
 ####
 
 # define pacman packages
-pacman_packages="base-devel cargo openssl-1.1 kmod openvpn privoxy bind-tools ipcalc wireguard-tools openresolv libnatpmp ldns"
+pacman_packages="base-devel cargo openssl-1.1 kmod openvpn privoxy bind-tools wireguard-tools openresolv libnatpmp ldns"
 
 # install pre-reqs
 pacman -S --needed $pacman_packages --noconfirm
 
+# define aur packages
+aur_packages="ipcalc-redhat"
+
+# call aur install script (arch user repo)
+source aur.sh
+
 # github release - microsocks
 ####
 

run/local/tools.sh

@@ -73,7 +73,7 @@ function get_docker_networking() {
 		docker_mask=$(ifconfig "${docker_interface}" | grep -P -o -m 1 '(?<=netmask\s)[^\s]+')
 
 		# convert netmask into cidr format, strip leading spaces
-		docker_network_cidr=$(ipcalc "${docker_ip}" "${docker_mask}" | grep -P -o -m 1 "(?<=Network:)\s+[^\s]+" | sed -e 's/^[[:space:]]*//')
+		docker_network_cidr=$(ipcalc -n -p "${docker_ip}" "${docker_mask}" | awk -F'=' '/^NETWORK/ {network=$2} /^PREFIX/ {prefix=$2} END {print network "/" prefix}')
 
 		# append docker interface, gateway adapter, gateway ip, ip, mask and cidr to string
 		docker_networking+="${docker_interface},${default_gateway_adapter},${default_gateway_ip},${docker_ip},${docker_mask},${docker_network_cidr} "