feat: clean up

Author: initbar

internal/cli/bash/bash_functions.sh

@@ -1,42 +1,58 @@
 # ~/.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 aptu() {
+    sudo apt update
+    sudo apt upgrade
+    sudo apt autoremove
+    sudo apt clean
   }
 
-  function __docker_vpn() {
+  function thumbnail() {
+    local filepath="$(basename "$1")"  # $filename + $extension
+    local filename="${filepath%.*}"
+    local extension="${filepath##*.}"
+
+    {
+      # Generate thumbnail seed.
+      local seed=$(openssl rand $RANDOM | md5sum | awk '{print $1}')
+
+      # Get total video duration in seconds.
+      local duration=$(ffprobe -i "$filepath" -show_entries format=duration -v quiet -of csv="p=0")
+
+      # Generate 20 snapshots.
+      ffmpeg -i "$filepath" -vf fps="20/${duration}" -vcodec png ${seed}-%002d.png &> /dev/null
+
+      # Collage snapshots.
+      montage -geometry +4+4 ${seed}-*.png "$filename.png" &> /dev/null
+
+      # Compress collage.
+      mogrify -quality '60%' "$filename.png"
+    } && rm ${seed}-*.png
+  }
+}
+
+{
+  function __vpn_check() {
     [ -n "$(docker network ls | grep wireguard)" ] || {
       docker network create wireguard
     }
 
+    [ -n "$(docker ps | grep vpn)" ] || {
+      # __vpn_openvpn
+      __vpn_wireguard
+    }
+  }
+
+  function __vpn_wireguard() {
     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 +64,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 "$@"
   }
@@ -57,13 +87,6 @@
       7z "$@"
   }
 
-  function aptu() {
-    sudo apt update
-    sudo apt upgrade
-    sudo apt autoremove
-    sudo apt clean
-  }
-
   function binwalk() {
     dsh \
       binwalk
@@ -86,33 +109,6 @@
       exiftool "$@"
   }
 
-  function gip() {
-    curl https://ipinfo.io
-  }
-
-  function thumbnail() {
-    local filepath="$(basename "$1")"  # $filename + $extension
-    local filename="${filepath%.*}"
-    local extension="${filepath##*.}"
-
-    {
-      # Generate thumbnail seed.
-      local seed=$(openssl rand $RANDOM | md5sum | awk '{print $1}')
-
-      # Get total video duration in seconds.
-      local duration=$(ffprobe -i "$filepath" -show_entries format=duration -v quiet -of csv="p=0")
-
-      # Generate 20 snapshots.
-      ffmpeg -i "$filepath" -vf fps="20/${duration}" -vcodec png ${seed}-%002d.png &> /dev/null
-
-      # Collage snapshots.
-      montage -geometry +4+4 ${seed}-*.png "$filename.png" &> /dev/null
-
-      # Compress collage.
-      mogrify -quality '60%' "$filename.png"
-    } && rm ${seed}-*.png
-  }
-
   function lrzip() {
     dsh \
       lrzip "$@"
@@ -125,18 +121,6 @@
         "$@"
   }
 
-  function mp3-dl() {
-    dsh \
-      yt-dlp \
-        --audio-format mp3 \
-        --audio-quality 320k \
-        --extract-audio \
-        --no-cache-dir \
-        --no-sponsorblock \
-        --verbose \
-        "$@"
-  }
-
   function pdfmerge() {
     dsh \
       gs \
@@ -149,71 +133,31 @@
         "$@"
   }
 
-  function rchk() {
-    dsh \
-      md5sum \
-        --binary \
-        --tag \
-        "$@"
-  }
-
-  function rsgn() {
-    local signature="$(md5sum $1 | head -c 8)"
-    local extension="$(echo $1 | tr . \\n | tail -n 1)"
-    mv -v "$1" "${signature}.${extension}"
-  }
-
   function strings() {
     dsh \
       strings \
         --all \
         "$@"
   }
 
-  function skaffold() {
-    docker run \
-      gcr.io/k8s-skaffold/skaffold:latest \
-      skaffold \
-      "$@"
-  }
-
   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}"' &&\
@@ -252,4 +196,16 @@
         --yes-playlist \
         "$@"
   }
+
+  function mp3-dl() {
+    dsh \
+      yt-dlp \
+        --audio-format mp3 \
+        --audio-quality 320k \
+        --extract-audio \
+        --no-cache-dir \
+        --no-sponsorblock \
+        --verbose \
+        "$@"
+  }
 }