From c7ff76840187071c72f0fdb2a6bbe26fdb4a084b Mon Sep 17 00:00:00 2001
From: VirtuBox <thomas@virtubox.net>
Date: Fri, 27 Dec 2019 20:48:33 +0100
Subject: [PATCH] remove CLEAN_PPA

---
 mybashrc | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/mybashrc b/mybashrc
index 53ff146..e0efd77 100644
--- a/mybashrc
+++ b/mybashrc
@@ -169,7 +169,6 @@ MAINTENANCE_APT() {
 
     if [ "$(id -u)" = "0" ] || [ -n "$IS_SUDOERS" ]; then
         export DEBIAN_FRONTEND=noninteractive
-        _CLEAN_PPA
         echo -e "${CGREEN}#############################################${CEND}"
         echo -e '       APT UPDATE               '
         echo -e "${CGREEN}#############################################${CEND}"
@@ -658,6 +657,9 @@ _SETUP_CONTROLLER() {
 
 _ZABBIX_UPDATE() {
     local distro
+    if ! command_exists lsb_release; then
+        apt install lsb-release -y >/dev/null
+    fi
     distro="$(lsb_release -si)"
     wget -O /tmp/zabbix.deb https://repo.zabbix.com/zabbix/4.4/"${distro,,}"/pool/main/z/zabbix-release/zabbix-release_4.4-1+"$(lsb_release -sc)"_all.deb
     dpkg -i /tmp/zabbix.deb
@@ -697,16 +699,13 @@ _DELETE_WO_SITES() {
     done
 }
 
-_CLEAN_PPA() {
-    rm -f /etc/apt/sources.list.d/{jonathonf-ubuntu-backports*,jonathonf-ubuntu-ffmpeg-4*}
-}
 
 _STABILISE_VIDEO() {
 
     for i in "$PWD"/*; do
         echo "Processing vid $i ...${i%.*}"
         ffmpeg -i "$i" -vf vidstabdetect=stepsize=6:shakiness=4:accuracy=15:result=/tmp/transform_vectors.trf -f null -
-        ffmpeg -i "$i" -vf vidstabtransform=input=/tmp/transform_vectors.trf:zoom=2:smoothing=10,unsharp=5:5:0.8:3:3:0.4 -c:v libx264 -preset slow -crf 18 -c:a aac -b:a 192k -pix_fmt yuv420p -movflags +faststart "${i%.*}-stable.mp4"
+        ffmpeg -i "$i" -vf vidstabtransform=input=/tmp/transform_vectors.trf:zoom=2:smoothing=10,unsharp=5:5:0.8:3:3:0.4 -c:v libx264 -preset slow -crf 18 -c:a copy -pix_fmt yuv420p -movflags +faststart "${i%.*}-stable.mp4"
         rm /tmp/transform_vectors.trf
         rm -f "$i"
     done