feat: clean up

Author: initbar

internal/cli/bash/bash_functions.sh

@@ -1,42 +1,26 @@
 # ~/.bash_functions
 
 {
-  function __docker() {
-    if [ -n "$(docker network ls | grep wireguard)" ]; then
-      docker run \
-        --interactive \
-        --network "container:wireguard" \
-        --rm \
-        --tty \
-        --user "${UID}:${UID}" \
-        --volume "$(readlink -f ${PWD}):/sandbox" \
-        --workdir /sandbox \
-        "$@"
-    else
-      docker run \
-        --interactive \
-        --rm \
-        --tty \
-        --user "${UID}:${UID}" \
-        --volume "$(readlink -f ${PWD}):/sandbox" \
-        --workdir /sandbox \
-        "$@"
-    fi
-  }
-
-  function __docker_vpn() {
+  function __vpn_check() {
     [ -n "$(docker network ls | grep wireguard)" ] || {
       docker network create wireguard
     }
 
+    [ -n "$(docker ps | grep vpn)" ] || {
+      # __vpn_openvpn_start
+      __vpn_wireguard_start
+    }
+  }
+
+  function __vpn_wireguard_start() {
     docker run \
       --cap-add=NET_ADMIN \
       --cap-add=SYS_MODULE \
       --detach \
       --device /dev/net/tun \
       --env PGID="$(id -g)" \
       --env PUID="$(id -u)" \
-      --name wireguard \
+      --name vpn \
       --publish="127.0.0.1:${RANDOM}:46882/udp" \
       --publish="127.0.0.1:${RANDOM}:50052/udp" \
       --publish="127.0.0.1:${RANDOM}:51413/tcp" \
@@ -48,6 +32,20 @@
       linuxserver/wireguard
   }
 
+  function __docker() {
+    __vpn_check && {
+      docker run \
+        --interactive \
+        --network "container:vpn" \
+        --rm \
+        --tty \
+        --user "$(id -u):$(id -u)" \
+        --volume "$(readlink -f ${PWD}):/sandbox" \
+        --workdir /sandbox \
+        "$@"
+    }
+  }
+
   function dsh() {
     __docker initbar/lib:latest "$@"
   }
@@ -178,42 +176,23 @@
   }
 
   function tcli() {
-    if [ -n "$(docker network ls | grep wireguard)" ]; then
-      __docker \
-        --detach \
-        --volume="${HOME}/.torrents:/home/ubuntu/Downloads" \
-        initbar/lib:latest \
-        transmission-cli \
-        --blocklist \
-        --encryption-preferred \
-        --no-downlimit \
-        --uplimit 1 \
-        --verify \
-        "$1"
-    else
-      __docker \
-        --detach \
-        --publish="127.0.0.1:${RANDOM}:46882/udp" \
-        --publish="127.0.0.1:${RANDOM}:50052/udp" \
-        --publish="127.0.0.1:${RANDOM}:51413/tcp" \
-        --publish="127.0.0.1:${RANDOM}:51413/udp" \
-        --publish="127.0.0.1:${RANDOM}:9091" \
-        --volume="${HOME}/.torrents:/home/ubuntu/Downloads" \
-        initbar/lib:latest \
-        transmission-cli \
-        --blocklist \
-        --encryption-preferred \
-        --no-downlimit \
-        --uplimit 1 \
-        --verify \
-        "$1"
-    fi
+    __docker \
+      --detach \
+      --volume="${HOME}/.torrents:/home/ubuntu/Downloads" \
+      initbar/lib:latest \
+      transmission-cli \
+      --blocklist \
+      --encryption-preferred \
+      --no-downlimit \
+      --uplimit 1 \
+      --verify \
+      "$1"
   }
 
   function tclis() {
     while :; do
       docker ps |\
-        egrep -v 'wireguard|CONTAINER' |\
+        egrep -v 'vpn|CONTAINER' |\
         awk '{print $1}' |\
         sort |\
         xargs -I{} sh -c 'PROGRESS=$(docker logs --tail 1 {} | egrep -o "(Progress: [0-9.]+%)|Seeding" | sort -u | tail -1 | sed "s/^/\[/; s/$/\]/"); echo "> Container: {} ${PROGRESS}"' &&\