Merge remote-tracking branch 'refs/remotes/origin/main'

Merge temporarily diverging branches into eachother.
This commit is contained in:
Sebastian Lenzlinger 2024-06-08 04:01:35 +02:00
commit a2b2e87513

View File

@ -8,12 +8,12 @@ function ex {
echo "Usage: ex <path/file_name>.<zip|rar|bz2|gz|tar|tbz2|tgz|Z|7z|xz|ex|tar.bz2|tar.gz|tar.xz>" echo "Usage: ex <path/file_name>.<zip|rar|bz2|gz|tar|tbz2|tgz|Z|7z|xz|ex|tar.bz2|tar.gz|tar.xz>"
echo " extract <path/file_name_1.ext> [path/file_name_2.ext] [path/file_name_3.ext]" echo " extract <path/file_name_1.ext> [path/file_name_2.ext] [path/file_name_3.ext]"
else else
for n in "$@" for n in "$@"; do
do
if [ -f "$n" ]; then if [ -f "$n" ]; then
case "${n%,}" in case "${n%,}" in
*.cbt | *.tar.bz2 | *.tar.gz | *.tar.xz | *.tbz2 | *.tgz | *.txz | *.tar) *.cbt | *.tar.bz2 | *.tar.gz | *.tar.xz | *.tbz2 | *.tgz | *.txz | *.tar)
tar xvf "$n" ;; tar xvf "$n"
;;
*.lzma) unlzma ./"$n" ;; *.lzma) unlzma ./"$n" ;;
*.bz2) bunzip2 ./"$n" ;; *.bz2) bunzip2 ./"$n" ;;
*.cbr | *.rar) unrar x -ad ./"$n" ;; *.cbr | *.rar) unrar x -ad ./"$n" ;;
@ -21,7 +21,8 @@ function ex {
*.cbz | *.epub | *.zip) unzip ./"$n" ;; *.cbz | *.epub | *.zip) unzip ./"$n" ;;
*.z) uncompress ./"$n" ;; *.z) uncompress ./"$n" ;;
*.7z | *.arj | *.cab | *.cb7 | *.chm | *.deb | *.dmg | *.iso | *.lzh | *.msi | *.pkg | *.rpm | *.udf | *.wim | *.xar) *.7z | *.arj | *.cab | *.cb7 | *.chm | *.deb | *.dmg | *.iso | *.lzh | *.msi | *.pkg | *.rpm | *.udf | *.wim | *.xar)
7z x ./"$n" ;; 7z x ./"$n"
;;
*.xz) unxz ./"$n" ;; *.xz) unxz ./"$n" ;;
*.exe) cabextract ./"$n" ;; *.exe) cabextract ./"$n" ;;
*.cpio) cpio -id <./"$n" ;; *.cpio) cpio -id <./"$n" ;;
@ -43,9 +44,36 @@ function ensure {
if [ -z "$1" ]; then if [ -z "$1" ]; then
echo "Usage: ensure <command>" echo "Usage: ensure <command>"
else else
if ! command -v $1 &> /dev/null if ! command -v $1 &>/dev/null; then
then
echo "$1 could not be found" echo "$1 could not be found"
fi fi
fi fi
} }
function htd {
echo "$((0x$1))"
}
function b2d {
echi "obase=10; ibase=2; $1" | bc
}
function h2d {
echi "obase=10; ibase=16; $1" | bc
}
function b2h {
echi "obase=16; ibase=2; $1" | bc
}
function h2b {
echi "obase=2; ibase=16; $1" | bc
}
function d2h {
echi "obase=16; ibase=10; $1" | bc
}
function d2b {
echi "obase=2; ibase=10; $1" | bc
}