From b89daa4f3c8cd7e2ff57b6db8a9745fd19fdfd33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gardais=20J=C3=A9r=C3=A9my?=
 <jeremy.gardais@univ-rennes1.fr>
Date: Fri, 12 Nov 2021 11:58:07 +0100
Subject: [PATCH] Use long-format for options

---
 proxmox/proxmox.template.debian.sh | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/proxmox/proxmox.template.debian.sh b/proxmox/proxmox.template.debian.sh
index 3d639c9..83ea553 100755
--- a/proxmox/proxmox.template.debian.sh
+++ b/proxmox/proxmox.template.debian.sh
@@ -16,8 +16,8 @@ systemctl restart sshd
 
 # set timezone
 echo "Europe/Paris" > /etc/timezone
-rm -f -- /etc/localtime
-dpkg-reconfigure -f noninteractive tzdata
+rm --force -- /etc/localtime
+dpkg-reconfigure --frontend noninteractive -- tzdata
 
 # }}}
 
@@ -33,7 +33,7 @@ export LC_ALL="${NEW_L}"
 sed -i -e "s/# \(${NEW_L} UTF-8\)/\1/" /etc/locale.gen
 locale-gen
 echo "LANG=\"${NEW_L}\"" > /etc/default/locale
-dpkg-reconfigure -f noninteractive locales
+dpkg-reconfigure --frontend noninteractive -- locales
 update-locale LANG="${NEW_L}"
 
 # }}}
@@ -41,10 +41,10 @@ update-locale LANG="${NEW_L}"
 # download an additionnal script to manage rsyslog and logrotate {{{
 
 # Previously used hostnamectl but it can't works correctly on LXC container with Apparmor
-debian_version=$(grep VERSION_CODENAME /etc/os-release | cut -d"=" -f2)
+debian_version=$(grep VERSION_CODENAME /etc/os-release | cut --delimiter="=" --fields=2)
 
-wget https://git.ipr.univ-rennes1.fr/cellinfo/tftpboot/raw/master/scripts/latecommand.tar.gz -O /tmp/latecommand.tar.gz
-tar xzf /tmp/latecommand.tar.gz -C /tmp/
+wget https://git.ipr.univ-rennes1.fr/cellinfo/tftpboot/raw/master/scripts/latecommand.tar.gz --output-document=/tmp/latecommand.tar.gz
+tar xzf /tmp/latecommand.tar.gz --directory=/tmp/
 /bin/sh /tmp/latecommand/post."${debian_version}".sh
 
 # }}}
@@ -53,7 +53,7 @@ tar xzf /tmp/latecommand.tar.gz -C /tmp/
 
 ## Clean downloaded and list of packages
 aptitude clean
-rm -f /var/cache/apt/*.bin
+rm --force -- /var/cache/apt/*.bin
 
 # }}}
 
@@ -61,8 +61,8 @@ rm -f /var/cache/apt/*.bin
 true > /etc/resolv.conf
 find /var/log -type f -iname "*.log" -delete -exec touch {} \;
 find /var/log -type f \( -iname "*.gz" -o -iname ".*.0" -o -iname "dmesg.*" \) -delete
-rm -f -- /root/.bash_history
-rm -rf -- /var/log/journal/*
+rm --force -- /root/.bash_history
+rm --recursive --force -- /var/log/journal/*
 
 # }}}