From 45359f3403c2d57a67d967ebf2afc8e056f6c408 Mon Sep 17 00:00:00 2001 From: VirtuBox Date: Mon, 10 Aug 2020 16:23:30 +0200 Subject: [PATCH] update setup-nodejs * fix rdfind * refactor ffmpeg-start-time --- mybashrc | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/mybashrc b/mybashrc index 82a1def..bcc92e6 100644 --- a/mybashrc +++ b/mybashrc @@ -112,21 +112,6 @@ DD_BENCHMARK_DISK() { } -ffmpeg_start_time() { - - if [ "$#" = "0" ]; then - echo "ffmpeg-cut-start " - echo "" - echo "example : ffmpeg-cut-start 00:34:24.85 file.mp4 300" - else - if [ -n "$3" ]; then - bash -c "ffmpeg -ss '$1' -y -i '$2' -t '$3' -c copy -movflags +faststart '${2%.mp4}-output.mp4';" - else - bash -c "ffmpeg -ss '$1' -y -i '$2' -c copy -movflags +faststart '${2%.mp4}-output.mp4';" - fi - fi -} - RANDOM_GIT_COMMIT() { [ -z "$(command -v w3m)" ] && { @@ -152,7 +137,7 @@ _find_duplicates() { apt-get install rdfind -y fi if [ "$2" = "--force" ]; then - rdfind -ignoreempty false "$1" + rdfind -ignoreempty false -deleteduplicates true "$1" else rdfind -dryrun true -ignoreempty false "$1" fi @@ -325,14 +310,15 @@ _NGINX_EE() { } _INSTALL_NODEJS() { - if [ -n "$1" ]; then - wget -O nodejs.sh https://deb.nodesource.com/setup_"$1".x + if [ "$#" -eq 0 ]; then + echo "Usage : setup-nodejs " + echo "Example : setup-nodejs 12" else - wget -O nodejs.sh https://deb.nodesource.com/setup_10.x + wget -O nodejs.sh https://deb.nodesource.com/setup_"$1".x fi chmod +x nodejs.sh ./nodejs.sh - rm nodejs.sh + rm -f nodejs.sh $NEED_SUDO apt-get install -y nodejs } @@ -699,6 +685,21 @@ _DELETE_WO_SITES() { done } +ffmpeg_start_time() { + + if [ "$#" = "0" ]; then + echo "ffmpeg-cut-start " + echo "" + echo "example : ffmpeg-cut-start 00:34 file.mp4 300" + else + if [ -n "$3" ]; then + bash -c "ffmpeg -ss '$1' -t '$3' -y -i '$2' -c copy -movflags +faststart '${2%.mp4}-output.mp4';" + else + bash -c "ffmpeg -ss '$1' -y -i '$2' -c copy -movflags +faststart '${2%.mp4}-output.mp4';" + fi + fi +} + _STABILISE_VIDEO() { for i in "$PWD"/*; do @@ -855,4 +856,4 @@ alias yt-encode=_YOUTUBE_ENCODE alias mp4convert=_MP4_CONVERT alias suroot='sudo su - root' alias apt-playbook='ansible-playbook /etc/ansible/playbooks/include/update-apt-servers.yml' -alias full-upgrade-playbook='ansible-playbook /etc/ansible/playbooks/update-all-servers.yml' \ No newline at end of file +alias full-upgrade-playbook='ansible-playbook /etc/ansible/playbooks/update-all-servers.yml'