diff --git a/arch-root/install.sh b/arch-root/install.sh index 4f17331..823f564 100755 --- a/arch-root/install.sh +++ b/arch-root/install.sh @@ -20,7 +20,7 @@ PACKAGES=( git zip # storage bc xxd # data processing gnupg pass pass-otp pwgen # crypt - imv mpv imagemagick gimp # media + imv mpv ffmpeg imagemagick gimp # media aichat libqalculate translate-shell # utils libreoffice-still # docs diff --git a/arch-user/bin/ffmpeg/add-subtitles.sh b/arch-user/bin/ffmpeg/add-subtitles.sh new file mode 100755 index 0000000..44c650a --- /dev/null +++ b/arch-user/bin/ffmpeg/add-subtitles.sh @@ -0,0 +1,21 @@ +#!/bin/bash + +if [ $# -ne 3 ]; then + echo "Usage: $0 " + exit 1 +fi +if [ ! -f "$1" ]; then + echo "Error: Video file '$1' not found" + exit 1 +fi +if [ ! -f "$2" ]; then + echo "Error: Subtitle file '$2' not found" + exit 1 +fi + +ext="${3##*.}" +if [ "$ext" = "mp4" ]; then + ffmpeg -i "$1" -i "$2" -c copy -c:s mov_text "$3" +else + ffmpeg -i "$1" -i "$2" -c copy "$3" +fi diff --git a/arch-user/config/bash/bashrc b/arch-user/config/bash/bashrc index 3f50247..fbb8a5a 100644 --- a/arch-user/config/bash/bashrc +++ b/arch-user/config/bash/bashrc @@ -4,7 +4,7 @@ shopt -s autocd -stty intr ^_ +stty intr ^N alias ssh='wssh' alias sudo='wsudo' diff --git a/arch-user/config/workspace-compat/bashrc b/arch-user/config/workspace-compat/bashrc index bed4550..affafce 100644 --- a/arch-user/config/workspace-compat/bashrc +++ b/arch-user/config/workspace-compat/bashrc @@ -1,5 +1,5 @@ [ -f ~/.bashrc ] && . ~/.bashrc -stty intr ^K +stty intr ^N alias ssh='wssh' alias sudo='wsudo' su() {