From dc75c53b1dd9aee0f2bb234a710d6fa0ef1841a2 Mon Sep 17 00:00:00 2001
From: aptalca <aptalca@linuxserver.io>
Date: Tue, 21 Sep 2021 14:20:27 -0400
Subject: [PATCH] standardize apt-get, rebase to 3.14

---
 Dockerfile                          |  2 +-
 root/etc/cont-init.d/95-apt-get     |  5 ++++
 root/etc/cont-init.d/98-striptracks | 44 ++++++++++++++---------------
 3 files changed, 27 insertions(+), 24 deletions(-)
 create mode 100644 root/etc/cont-init.d/95-apt-get

diff --git a/Dockerfile b/Dockerfile
index a280fb2..25e787e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
 ## Buildstage ##
-FROM ghcr.io/linuxserver/baseimage-alpine:3.12 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.14 as buildstage
 
 # Build arguments
 ARG VERSION
diff --git a/root/etc/cont-init.d/95-apt-get b/root/etc/cont-init.d/95-apt-get
new file mode 100644
index 0000000..8e5fe66
--- /dev/null
+++ b/root/etc/cont-init.d/95-apt-get
@@ -0,0 +1,5 @@
+#!/usr/bin/with-contenv bash
+
+if [ -f /usr/bin/apt ]; then
+    apt-get update
+fi
diff --git a/root/etc/cont-init.d/98-striptracks b/root/etc/cont-init.d/98-striptracks
index cbaf6f7..58d0257 100644
--- a/root/etc/cont-init.d/98-striptracks
+++ b/root/etc/cont-init.d/98-striptracks
@@ -13,37 +13,35 @@ EOF
 
 # Determine if setup is needed
 if [ ! -f /usr/bin/mkvmerge ]; then
-  echo "Running first time setup."
+    echo "Running first time setup."
 
-  if [ -f /usr/bin/apt ]; then
-    # Ubuntu
-    echo "Installing MKVToolNix using apt-get"
-    apt-get update && \
-    apt-get -y install mkvtoolnix && \
-    rm -rf /var/lib/apt/lists/*
-  elif [ -f /sbin/apk ]; then
-    # Alpine
-    echo "Installing MKVToolNix using apk"
-    apk add --no-cache mkvtoolnix && \
-    rm -rf /var/lib/apt/lists/*
-  else
-    # Unknown
-    echo "Unknown package manager.  Attempting to install MKVToolNix using apt-get"
-    apt-get update && \
-    apt-get -y install mkvtoolnix && \
-    rm -rf /var/lib/apt/lists/*
-  fi
+    if [ -f /usr/bin/apt ]; then
+        # Ubuntu
+        echo "Installing MKVToolNix using apt-get"
+        apt-get -y install mkvtoolnix && \
+        rm -rf /var/lib/apt/lists/*
+    elif [ -f /sbin/apk ]; then
+        # Alpine
+        echo "Installing MKVToolNix using apk"
+        apk add --no-cache mkvtoolnix && \
+        rm -rf /var/lib/apt/lists/*
+    else
+        # Unknown
+        echo "Unknown package manager.  Attempting to install MKVToolNix using apt-get"
+        apt-get -y install mkvtoolnix && \
+        rm -rf /var/lib/apt/lists/*
+    fi
 fi
 
 # Change ownership
 if [ $(stat -c '%G' /usr/local/bin/striptracks.sh) != "abc" ]; then
-  echo "Changing ownership on scripts."
-  chown abc:abc /usr/local/bin/striptracks*.sh
+    echo "Changing ownership on scripts."
+    chown abc:abc /usr/local/bin/striptracks*.sh
 fi
 
 # Make executable
 if [ ! -x /usr/local/bin/striptracks.sh ]; then
-  echo "Making scripts executable."
-  chmod +x /usr/local/bin/striptracks*.sh
+    echo "Making scripts executable."
+    chmod +x /usr/local/bin/striptracks*.sh
 fi