refactor

1 files changed, 13 insertions, 11 deletions

diff --git a/install-packages.bash b/install-packages.bash
index d0b51c9..0ad13da 100644
--- a/install-packages.bash
+++ b/install-packages.bash
@@ -1,19 +1,23 @@
 #!/bin/bash
 set -e
 
-apt()
-{
-        (set -x; command apt "$@")
-}
-
-[ "$(id -u)" = 0 ] || exec sudo bash "$0" "$@"
-
 basics='etckeeper git par ssh tmux vim w3m debhelper'
 docs='info bash-doc make-doc'
 xorg='xorg xterm x11vnc xserver-xephyr xtightvncviewer xdotool'
 media='libdbus-glib-1-2 mpv pulseaudio imagemagick'
 
-apt install -q --show-progress --no-upgrade $basics $docs $xorg $media
+main()
+{
+    [ "$(id -u)" = 0 ] || exec sudo bash "$0" "$@"
+
+    apt install -q --show-progress --no-upgrade $basics $docs $xorg $media
+    apt_backport /usr/local/src https://salsa.debian.org/i3-team/i3-wm.git i3-wm
+}
+
+apt()
+{
+        (set -x; command apt "$@")
+}
 
 all_files_exist()
 {
@@ -97,6 +101,4 @@ get_build_deps()
                        -e 's/[\(][^)]*[\)] //g')
 }
 
-try_newer_build_deps=y
-apt_backport /usr/local/src https://salsa.debian.org/i3-team/i3-wm.git i3-wm
-
+main "$@"