Cleanups, write log files of sonarr and mysql to host

build/scripts/automysqlbackup.sh

@@ -11,7 +11,7 @@ export_env AUTOMYSQLBACKUP_CONFIG /etc/automysqlbackup/automysqlbackup.conf
 export_env AUTOMYSQLBACKUP_DATA /host/var/backup/db
 
 ## AutoMySQLBackup
-apt_get_install_permanent mysql-client
+apt_install_permanent mysql-client
 cd /opt
 wget "http://downloads.sourceforge.net/project/automysqlbackup/AutoMySQLBackup/AutoMySQLBackup VER $AUTOMYSQLBACKUP_VERSION_MAJOR/automysqlbackup-$AUTOMYSQLBACKUP_VERSION.tar.gz"
 mkdir automysqlbackup

build/scripts/backintime.sh

@@ -7,7 +7,7 @@ set -x
 
 
 ## BackInTime
-apt_get_install_permanent backintime-common python-dbus
+apt_install_permanent backintime-common python-dbus
 
 ## Configuration
 

build/scripts/chrome.sh

@@ -4,7 +4,7 @@ source /build/config
 set -x
 
 ## Chrome dependencies
-apt_get_install_permanent gconf-service libasound2 libatk1.0-0 libcairo2 libcap2 libcups2 libcurl3 libfontconfig1 libgdk-pixbuf2.0-0 libgtk2.0-0 libnspr4 libnss3 libpango1.0-0 librtmp0 libxss1 libxtst6 xdg-utils
+apt_install_permanent gconf-service libasound2 libatk1.0-0 libcairo2 libcap2 libcups2 libcurl3 libfontconfig1 libgdk-pixbuf2.0-0 libgtk2.0-0 libnspr4 libnss3 libpango1.0-0 librtmp0 libxss1 libxtst6 xdg-utils
 
 ## Chrome
 mkdir -p /usr/share/icons/hicolor

build/scripts/cleanup.sh

@@ -5,7 +5,7 @@ set -x
 
 ## Remove temporary packages for minimal builds
 if [ $MODE == "minimal" ]; then
-    cat /build/temporary | xargs apt_remove
+    apt_remove "$(cat /build/temporary)"
 fi
 
 ## Clean apt files

build/scripts/collectd.sh

@@ -4,4 +4,4 @@ source /build/config
 set -x
 
 ## collectd
-apt_get_install_permanent libsensors4 collectd
+apt_install_permanent libsensors4 collectd

build/scripts/compile.sh

@@ -4,4 +4,4 @@ source /build/config
 set -x
 
 ## Often used tools
-apt_get_install_temporary gcc make automake libtool
+apt_install_temporary gcc make automake libtool

build/scripts/cron.sh

@@ -4,7 +4,7 @@ source /build/config
 set -x
 
 ## Install cron daemon
-apt_get_install_permanent cron
+apt_install_permanent cron
 
 ## Remove useless cron entries
 # Checks for lost+found and scans for mtab

build/scripts/firefox.sh

@@ -4,7 +4,7 @@ source /build/config
 set -x
 
 ## Chrome dependencies
-apt_get_install_permanent firefox
+apt_install_permanent firefox
 
 ## Pulseaudio script
 echo "PULSE_SERVER=host firefox" > /opt/firefox

build/scripts/ftp.sh

@@ -7,5 +7,5 @@ set -x
 export_env FTP_DATA /host/var/lib/ftp
 
 ## Pure-FTPd
-apt-get update
-apt_get_install_permanent pure-ftpd
+apt update
+apt_install_permanent pure-ftpd

build/scripts/gmrender.sh

@@ -4,7 +4,7 @@ source /build/config
 set -x
 
 # GMediaRender dependencies
-apt_get_install_permanent libupnp-dev libgstreamer0.10-dev \
+apt_install_permanent libupnp-dev libgstreamer0.10-dev \
             gstreamer0.10-plugins-base gstreamer0.10-plugins-good \
             gstreamer0.10-plugins-bad gstreamer0.10-plugins-ugly \
             gstreamer0.10-ffmpeg \

build/scripts/hamachi.sh

@@ -4,7 +4,7 @@ source /build/config
 set -x
 
 ## Hamachi dependency
-apt_get_install_permanent lsb-core net-tools socat strace
+apt_install_permanent lsb-core net-tools socat strace
 
 ## Hamachi
 cd /opt

build/scripts/headphones.sh

@@ -14,5 +14,5 @@ git clone https://github.com/rembo10/headphones.git
  
 ## Encoders
 echo "deb http://ppa.launchpad.net/mc3man/trusty-media/ubuntu $(lsb_release -c -s) main" | sudo tee -a /etc/apt/sources.list
-apt-get update
-apt_get_install_permanent --force-yes ffmpeg libmp3lame0 libavcodec-extra-54
+apt update
+apt_install_permanent --force-yes ffmpeg libmp3lame0 libavcodec-extra-54

build/scripts/lighttpd.sh

@@ -11,9 +11,9 @@ export_env LIGHTTPD_CONFIG /etc/lighttpd/lighttpd.conf
 export_env LIGHTTPD_LOG /host/var/log/lighttpd/error.log
 
 ## Lighthttpd
-apt_get_install_permanent lighttpd
-apt-get build-dep -y lighttpd
-apt_get_install_temporary automake
+apt_install_permanent lighttpd
+apt build-dep -y lighttpd
+apt_install_temporary automake
 cd /opt
 wget http://download.lighttpd.net/lighttpd/releases-$LIGHTTPD_VERSION_MAJOR.x/lighttpd-$LIGHTTPD_VERSION.tar.gz
 tar xzf lighttpd-$LIGHTTPD_VERSION.tar.gz && \

build/scripts/minidlna.sh

@@ -4,7 +4,7 @@ source /build/config
 set -x
 
 # MiniDLNA dependencies
-apt_get_install_permanent gettext libavutil-dev libavcodec-dev libavformat-dev libjpeg-dev libsqlite3-dev libexif-dev libid3tag0-dev libogg-dev libvorbis-dev libFLAC-dev
+apt_install_permanent gettext libavutil-dev libavcodec-dev libavformat-dev libjpeg-dev libsqlite3-dev libexif-dev libid3tag0-dev libogg-dev libvorbis-dev libFLAC-dev
 
 export MINIDLNA_VERSION=1.1.1
 export MINIDLNA_CONFIG=/host/etc/minidlna.conf

build/scripts/mysql.sh

@@ -6,7 +6,7 @@ set -x
 ## MySQL
 debconf-set-selections <<< 'mariadb-server mariadb-server/root_password password dummy'
 debconf-set-selections <<< 'mariadb-server mariadbql-server/root_password_again password dummy'
-apt_get_install_permanent mariadb-server 
+apt_install_permanent mariadb-server 
 
 ## Environment
 export_env MYSQL_CONFIG /etc/mysql/my.cnf

build/scripts/php.sh

@@ -9,9 +9,9 @@ export_env PHP_CONFIG /usr/local/lib/php.ini
 export_env PHP_TIMEZONE Europe/Amsterdam
 
 ## PHP
-apt_get_install_temporary gcc make
+apt_install_temporary gcc make
 cd /opt
-apt_get_install_permanent libxml2-dev libcurl4-openssl-dev libbz2-dev libjpeg-dev libpng12-dev libmcrypt-dev
+apt_install_permanent libxml2-dev libcurl4-openssl-dev libbz2-dev libjpeg-dev libpng12-dev libmcrypt-dev
 wget http://uk1.php.net/get/php-$PHP_VERSION.tar.gz/from/this/mirror -O  php-$PHP_VERSION.tar.gz && \
 tar xzf php-$PHP_VERSION.tar.gz && \
 cd php-$PHP_VERSION

build/scripts/prepare.sh

@@ -18,7 +18,7 @@ export_env INITRD no
 ## Enable Ubuntu Universe and Multiverse.
 sed -i 's/^#\s*\(deb.*universe\)$/\1/g' /etc/apt/sources.list
 sed -i 's/^#\s*\(deb.*multiverse\)$/\1/g' /etc/apt/sources.list
-apt-get update
+apt update
 
 ## Fix some issues with APT packages
 ## See https://github.com/dotcloud/docker/issues/1024
@@ -37,11 +37,11 @@ ln -sf /bin/true /usr/bin/ischroot
 ln -sf /bin/true /usr/bin/chfn
 
 ## Install HTTPS support for APT
-apt_get_install_permanent apt-transport-https
+apt_install_permanent apt-transport-https
 
 ## Upgrade all packages
-apt-get dist-upgrade -y --no-install-recommends
+apt dist-upgrade -y --no-install-recommends
 
 ## Fix locale
-apt_get_install_permanent language-pack-en
+apt_install_permanent language-pack-en
 locale-gen en_US

build/scripts/pulseaudio.sh

@@ -4,7 +4,7 @@ source /build/config
 set -x
 
 ## Pulseaudio
-apt_get_install_permanent pulseaudio
+apt_install_permanent pulseaudio
 
 ## Setup environment
 sed -i "1iexport PULSE_SERVER=host" /root/.profile

build/scripts/redis.sh

@@ -4,7 +4,7 @@ source /build/config
 set -x
 
 ## Redis
-apt_get_install_permanent redis-server
+apt_install_permanent redis-server
 
 export REDIS_CONFIG=/etc/redis/redis.conf
 export REDIS_LOG=/host/var/log/redis/redis.log

build/scripts/runit.sh

@@ -4,4 +4,4 @@ source /build/config
 set -x
 
 ## Install runit
-apt_get_install_permanent runit
+apt_install_permanent runit

build/scripts/sabnzbd.sh

@@ -11,11 +11,11 @@ export_env SABNZBD_DATA /host/var/lib/sabnzbd
 ## SABnzbd
 echo "deb http://ppa.launchpad.net/jcfp/ppa/ubuntu $(lsb_release -c -s) main" | sudo tee -a /etc/apt/sources.list
 apt-key adv --keyserver hkp://keyserver.ubuntu.com:11371 --recv-keys 0x98703123E0F52B2BE16D586EF13930B14BB9F05F
-apt-get update
-apt_get_install_permanent sabnzbdplus
+apt update
+apt_install_permanent sabnzbdplus
 
 ## Utilities
-apt_get_install_permanent unzip par2 python-openssl python-yenc
+apt_install_permanent unzip par2 python-openssl python-yenc
 
 ## Rar
 cd /opt

build/scripts/sickbeard.sh

@@ -8,6 +8,6 @@ export_env SICKBEARD_CONFIG /host/etc/sickbeard/config.ini
 export_env SICKBEARD_DATA /host/var/lib/sickbeard 
 
 ## SickBeard
-apt_get_install_permanent python-cheetah
+apt_install_permanent python-cheetah
 cd /opt
 git clone https://github.com/midgetspy/Sick-Beard.git

build/scripts/sonarr.sh

@@ -9,6 +9,6 @@ export_env SONARR_DATA /host/var/lib/sonarr
 ## Sonarr
 apt-key adv --keyserver keyserver.ubuntu.com --recv-keys FDA5DFFC
 echo "deb http://apt.sonarr.tv/ develop main" | tee -a /etc/apt/sources.list
-apt-get update
-apt_get_install_permanent nzbdrone mediainfo
+apt update
+apt_install_permanent nzbdrone mediainfo
 chmod +x /opt/NzbDrone/NzbDrone.exe

build/scripts/sshd.sh

@@ -4,7 +4,7 @@ source /build/config
 set -x
 
 ## Install the SSH server
-apt_get_install_permanent openssh-server
+apt_install_permanent openssh-server
 mkdir /var/run/sshd
 
 ## Install root key
@@ -19,7 +19,7 @@ ssh-keygen -t rsa -N "" -f id_rsa
 cat /opt/id_rsa.pub >> "$AUTHORIZED_KEYS"
 
 ## X11 forwarding
-apt_get_install_permanent xauth
+apt_install_permanent xauth
 
 ## Setup environment
 sed -i "1iexport HOME=/root" /root/.profile

build/scripts/syslog.sh

@@ -4,6 +4,6 @@ source /build/config
 set -x
 
 ## Install a syslog daemon
-apt_get_install_permanent syslog-ng-core
+apt_install_permanent syslog-ng-core
 mkdir -p /var/lib/syslog-ng
 sed -i "s/^\(#SYSLOGNG_OPTS=\).*$/\1\"--no-caps --default-modules=affile,afprog,afsocket,afuser,basicfuncs,csvparser,dbparser,syslogformat\"/" /etc/default/syslog-ng

build/scripts/transmission.sh

@@ -4,7 +4,7 @@ source /build/config
 set -x
 
 ## Transmission
-apt_get_install_permanent transmission-daemon jq
+apt_install_permanent transmission-daemon jq
 
 ## Environment
 export_env TRANSMISSION_CONFIG /host/etc/transmission

build/scripts/upnpproxy.sh

@@ -4,7 +4,7 @@ source /build/config
 set -x
 
 ## UPnP Proxy dependency
-apt_get_install_permanent uuid-dev
+apt_install_permanent uuid-dev
 
 ## UPnP Proxy
 cd opt

build/scripts/utilities.sh

@@ -4,8 +4,8 @@ source /build/config
 set -x
 
 ## Often used tools
-apt_get_install_permanent wget curl python-pip git
-apt_get_install_temporary inetutils-ping telnet
+apt_install_permanent wget curl python-pip git
+apt_install_temporary inetutils-ping telnet
 
 ## Often used python modules
 pip install argparse