From e60ca859d6630c0823b9540ca1df9fba10a539d9 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Mon, 24 Oct 2016 22:47:14 +0200
Subject: [PATCH] Change et to expandtab (which is the same but more verbose)

---
 astronaut/astrohelp                 | 6 +++---
 astronaut/astronaut.sat             | 2 +-
 astronaut/examples/hello.sat        | 2 +-
 astronaut/template.sat              | 2 +-
 satellites/3dstool-git.sat          | 2 +-
 satellites/3dstool.sat              | 2 +-
 satellites/apulse.sat               | 2 +-
 satellites/armips-git.sat           | 2 +-
 satellites/bam-0.4.sat              | 2 +-
 satellites/bam.sat                  | 2 +-
 satellites/broadcom-wl.sat          | 2 +-
 satellites/cabextract.sat           | 2 +-
 satellites/confuse.sat              | 2 +-
 satellites/create_ap-git.sat        | 2 +-
 satellites/ctrtool.sat              | 2 +-
 satellites/ctrulib-bin.sat          | 2 +-
 satellites/ctrulib-git.sat          | 2 +-
 satellites/devkitarm-bin.sat        | 2 +-
 satellites/dunst.sat                | 2 +-
 satellites/fakeroot.sat             | 2 +-
 satellites/ffmpeg.sat               | 2 +-
 satellites/fluidsynth.sat           | 2 +-
 satellites/gfm-git.sat              | 2 +-
 satellites/giblib.sat               | 2 +-
 satellites/go.sat                   | 4 ++--
 satellites/gtksourceview2.sat       | 2 +-
 satellites/hostapd.sat              | 2 +-
 satellites/i3.sat                   | 2 +-
 satellites/i3lock.sat               | 2 +-
 satellites/i3status.sat             | 2 +-
 satellites/imlib2.sat               | 2 +-
 satellites/intel-ucode.sat          | 2 +-
 satellites/json-glib.sat            | 2 +-
 satellites/jstest-gtk-git.sat       | 2 +-
 satellites/libass.sat               | 2 +-
 satellites/libev.sat                | 2 +-
 satellites/libmodplug.sat           | 2 +-
 satellites/libticables-git.sat      | 2 +-
 satellites/libticalcs-git.sat       | 2 +-
 satellites/libticonv-git.sat        | 2 +-
 satellites/libtifiles-git.sat       | 2 +-
 satellites/libtorrent-rasterbar.sat | 2 +-
 satellites/libwebp.sat              | 2 +-
 satellites/libxdg-basedir.sat       | 2 +-
 satellites/libxkbcommon.sat         | 2 +-
 satellites/livestreamer.sat         | 2 +-
 satellites/love.sat                 | 2 +-
 satellites/lua.sat                  | 2 +-
 satellites/luajit.sat               | 2 +-
 satellites/maim.sat                 | 2 +-
 satellites/makerom.sat              | 2 +-
 satellites/mpv.sat                  | 2 +-
 satellites/ninja.sat                | 2 +-
 satellites/nxengine.sat             | 2 +-
 satellites/openal.sat               | 2 +-
 satellites/p7zip.sat                | 2 +-
 satellites/pdnsd.sat                | 2 +-
 satellites/perl-module-build.sat    | 2 +-
 satellites/physfs.sat               | 2 +-
 satellites/pidgin-libnotify.sat     | 2 +-
 satellites/po4a.sat                 | 2 +-
 satellites/purple-skypeweb.sat      | 2 +-
 satellites/purple-telegram.sat      | 2 +-
 satellites/pygtksourceview2.sat     | 2 +-
 satellites/python3-docutils.sat     | 2 +-
 satellites/python3-jinja2.sat       | 2 +-
 satellites/python3-markupsafe.sat   | 2 +-
 satellites/python3-peg2.sat         | 2 +-
 satellites/python3-pygments.sat     | 2 +-
 satellites/python3-qt5.sat          | 2 +-
 satellites/python3-requests.sat     | 2 +-
 satellites/python3-setuptools.sat   | 2 +-
 satellites/python3-sip.sat          | 2 +-
 satellites/python3-yaml.sat         | 2 +-
 satellites/python3.sat              | 2 +-
 satellites/qbittorrent.sat          | 2 +-
 satellites/qemu.sat                 | 2 +-
 satellites/qt5-base.sat             | 2 +-
 satellites/qt5-styleplugins-git.sat | 2 +-
 satellites/qt5-tools.sat            | 2 +-
 satellites/qt5-webkit.sat           | 2 +-
 satellites/qutebrowser.sat          | 2 +-
 satellites/radare2-git.sat          | 2 +-
 satellites/rofi.sat                 | 2 +-
 satellites/rt8192cu-git.sat         | 2 +-
 satellites/rxvt-unicode.sat         | 2 +-
 satellites/scrot.sat                | 2 +-
 satellites/sdl2.sat                 | 2 +-
 satellites/sdl2_image.sat           | 2 +-
 satellites/sdl2_mixer.sat           | 2 +-
 satellites/slop.sat                 | 2 +-
 satellites/spasm-ng-git.sat         | 2 +-
 satellites/steam.sat                | 2 +-
 satellites/streamlink.sat           | 2 +-
 satellites/syncthing.sat            | 2 +-
 satellites/teeworlds.sat            | 2 +-
 satellites/tilp-git.sat             | 2 +-
 satellites/tlp.sat                  | 2 +-
 satellites/unetbootin.sat           | 2 +-
 satellites/vbindiff.sat             | 2 +-
 satellites/volumeicon.sat           | 2 +-
 satellites/waf.sat                  | 2 +-
 satellites/webfs.sat                | 2 +-
 satellites/wine.sat                 | 2 +-
 satellites/xautolock.sat            | 2 +-
 satellites/xcb-util-xrm.sat         | 2 +-
 satellites/yajl.sat                 | 2 +-
 satellites/youtube-dl.sat           | 2 +-
 satellites/zim.sat                  | 2 +-
 109 files changed, 112 insertions(+), 112 deletions(-)

diff --git a/astronaut/astrohelp b/astronaut/astrohelp
index 26953cf..2d624a5 100755
--- a/astronaut/astrohelp
+++ b/astronaut/astrohelp
@@ -20,11 +20,11 @@ satellite="$(realpath "$1")"
 function="$2"
 
 # Functions reused in different wrappers
-func_import=$(printf '
+func_import="$(printf '
     import() {
         . "%s/functions/$1.sh"
     }
-' "$(dirname "$satellite")")
+' "$(dirname "$satellite")")"
 
 if [ "$function" = "variable" ]; then
     name="$3"
@@ -58,7 +58,7 @@ elif [ "$function" = "downloads" ]; then
 elif [ "$function" = "options" ]; then
     printf "$func_import"'
         define_option() {
-            echo "$1"
+            [ "$1" ] && echo "$1"
         }
         header_end() { exit 0; }
         . %s
diff --git a/astronaut/astronaut.sat b/astronaut/astronaut.sat
index 2c3e24d..a22311b 100644
--- a/astronaut/astronaut.sat
+++ b/astronaut/astronaut.sat
@@ -31,4 +31,4 @@ option xbps install -D 'xbps-astronaut' "$dir_install/$dir_prefix/bin/xbps-astro
 option pacman install -D 'pacman-astronaut' "$dir_install/$dir_prefix/bin/pacman-astronaut"
 option pkgtools install -D 'astronautpkg' "$dir_install/$dir_prefix/bin/astronautpkg"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/astronaut/examples/hello.sat b/astronaut/examples/hello.sat
index bbb7a33..a3eef67 100644
--- a/astronaut/examples/hello.sat
+++ b/astronaut/examples/hello.sat
@@ -108,4 +108,4 @@ echo "Value of option test = $(option =test)"
 #safe_sed 'oh/i/hope\i\canuse%&thisinsed'
 # Escapes all the necessary characters to be able to use an arbitrary string in a regular sed command
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/astronaut/template.sat b/astronaut/template.sat
index 3e96efe..1927d77 100644
--- a/astronaut/template.sat
+++ b/astronaut/template.sat
@@ -18,4 +18,4 @@ option check make check
 make DESTDIR="$dir_install" install
 rm -f "$dir_install/$dir_prefix/share/info/dir"  # This file collides with some other packages.
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/3dstool-git.sat b/satellites/3dstool-git.sat
index ff9c50d..ff91eb0 100644
--- a/satellites/3dstool-git.sat
+++ b/satellites/3dstool-git.sat
@@ -10,4 +10,4 @@ cd "$name"
 compile_cmake -I
 install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "bin/Release/$name"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/3dstool.sat b/satellites/3dstool.sat
index 6d69532..2e6f11e 100644
--- a/satellites/3dstool.sat
+++ b/satellites/3dstool.sat
@@ -13,4 +13,4 @@ cd "$name-$version"
 compile_cmake -I
 install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "bin/Release/$name"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/apulse.sat b/satellites/apulse.sat
index 0fe052c..7943514 100644
--- a/satellites/apulse.sat
+++ b/satellites/apulse.sat
@@ -16,4 +16,4 @@ install -Dm755 -t "$dir_install/$dir_prefix/$dir_libdir" \
 ln -s libpulse-simple.so.0 "$dir_install/$dir_prefix/$dir_libdir/libpulse-simple.so"
 ln -s libpulse.so.0 "$dir_install/$dir_prefix/$dir_libdir/libpulse.so"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/armips-git.sat b/satellites/armips-git.sat
index 542cda2..ff33bd8 100644
--- a/satellites/armips-git.sat
+++ b/satellites/armips-git.sat
@@ -10,4 +10,4 @@ cd "$name"
 compile_cmake -I
 install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "build/$name"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/bam-0.4.sat b/satellites/bam-0.4.sat
index bb56c81..35aa513 100644
--- a/satellites/bam-0.4.sat
+++ b/satellites/bam-0.4.sat
@@ -16,4 +16,4 @@ sed -i -e "s/-rdynamic/& $(safe_sed "$CFLAGS")/" make_unix.sh
 ./make_unix.sh
 install -Dm755 "$name" "$dir_install/$dir_prefix/$dir_bindir/$name-0.4"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/bam.sat b/satellites/bam.sat
index f115f6c..fbf5eb9 100644
--- a/satellites/bam.sat
+++ b/satellites/bam.sat
@@ -16,4 +16,4 @@ EOF
 make
 install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/broadcom-wl.sat b/satellites/broadcom-wl.sat
index 09876c9..79cae6b 100644
--- a/satellites/broadcom-wl.sat
+++ b/satellites/broadcom-wl.sat
@@ -29,4 +29,4 @@ make KBUILD_DIR="$dir_sysroot/lib/modules/$kver/build"
 install -Dm644 -t "$dir_install/lib/modules/$kver/kernel/drivers/net/wireless" wl.ko
 install -Dm644 "$name-dkms.conf" "$dir_install/$dir_sysconfdir/modprobe.d/$name.conf"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/cabextract.sat b/satellites/cabextract.sat
index dd2411e..3cc73a3 100644
--- a/satellites/cabextract.sat
+++ b/satellites/cabextract.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/confuse.sat b/satellites/confuse.sat
index d418bbb..882709c 100644
--- a/satellites/confuse.sat
+++ b/satellites/confuse.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_configure -- --disable-static
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/create_ap-git.sat b/satellites/create_ap-git.sat
index 4ffd076..8db018b 100644
--- a/satellites/create_ap-git.sat
+++ b/satellites/create_ap-git.sat
@@ -10,4 +10,4 @@ install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name"
 install -Dm644 -t "$dir_install/$dir_sysconfdir" "$name.conf"
 install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/bash-completion/$name" bash_completion
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/ctrtool.sat b/satellites/ctrtool.sat
index 03022bc..af728d2 100644
--- a/satellites/ctrtool.sat
+++ b/satellites/ctrtool.sat
@@ -11,4 +11,4 @@ cd "$name-$version/ctrtool"
 make
 install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" ctrtool
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/ctrulib-bin.sat b/satellites/ctrulib-bin.sat
index 2cc6327..4a9f355 100644
--- a/satellites/ctrulib-bin.sat
+++ b/satellites/ctrulib-bin.sat
@@ -11,4 +11,4 @@ header_end
 mkdir -p "$dir_install/$dir_prefix/$dir_libdir/devkitPRO/$libname"
 extract "$libname-$version.tar.bz2" "$dir_install/$dir_prefix/$dir_libdir/devkitPRO/$libname"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/ctrulib-git.sat b/satellites/ctrulib-git.sat
index ebede2a..63e26b3 100644
--- a/satellites/ctrulib-git.sat
+++ b/satellites/ctrulib-git.sat
@@ -8,4 +8,4 @@ header_end
 cd "$name/libctru"
 make DEVKITPRO="$dir_install/$dir_prefix/$dir_libdir/devkitPRO" install
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/devkitarm-bin.sat b/satellites/devkitarm-bin.sat
index 9e707d7..2c2a455 100644
--- a/satellites/devkitarm-bin.sat
+++ b/satellites/devkitarm-bin.sat
@@ -13,4 +13,4 @@ extract "${name}_$version-x86_64-linux.tar.bz2" "$dir_install/$dir_prefix/$dir_l
 sed -i -e "s/%DEVKITPRO%/$(safe_sed "$dir_sysroot/$dir_prefix/$dir_libdir/devkitPRO")/g" devkitarm.sh
 install -Dm755 -t "$dir_install/$dir_sysconfdir/profile.d/" devkitarm.sh
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/dunst.sat b/satellites/dunst.sat
index 0b28119..6893154 100644
--- a/satellites/dunst.sat
+++ b/satellites/dunst.sat
@@ -16,4 +16,4 @@ make install \
     PREFIX="/$dir_prefix" \
     MANPREFIX="/$dir_prefix/$dir_mandir"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/fakeroot.sat b/satellites/fakeroot.sat
index 7f2b3d5..6e82735 100644
--- a/satellites/fakeroot.sat
+++ b/satellites/fakeroot.sat
@@ -17,4 +17,4 @@ cd ..
 ./bootstrap
 compile_configure -- --disable-static
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/ffmpeg.sat b/satellites/ffmpeg.sat
index 90f5993..c629597 100644
--- a/satellites/ffmpeg.sat
+++ b/satellites/ffmpeg.sat
@@ -22,4 +22,4 @@ cd "$name-$version"
 make
 make DESTDIR="$dir_install" install
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/fluidsynth.sat b/satellites/fluidsynth.sat
index 8b851c3..924b682 100644
--- a/satellites/fluidsynth.sat
+++ b/satellites/fluidsynth.sat
@@ -12,4 +12,4 @@ header_end
 cd "$name-$version"
 compile_configure -- --disable-static
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/gfm-git.sat b/satellites/gfm-git.sat
index 832bc2f..961cfa4 100644
--- a/satellites/gfm-git.sat
+++ b/satellites/gfm-git.sat
@@ -10,4 +10,4 @@ cd tilp_and_gfm/gfm/trunk
 autoreconf -i
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/giblib.sat b/satellites/giblib.sat
index 235e9c4..a3c16ee 100644
--- a/satellites/giblib.sat
+++ b/satellites/giblib.sat
@@ -22,4 +22,4 @@ done
 autoreconf -i
 compile_configure -- --disable-static
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/go.sat b/satellites/go.sat
index 27879f0..17b8c47 100644
--- a/satellites/go.sat
+++ b/satellites/go.sat
@@ -3,7 +3,7 @@ version=1.7.3
 bootstrap_version=1.4.3
 update_url='https://golang.org/dl/'
 
-define_option '!bootstrap: Build for the first time'
+define_option '!bootstrap: Bootstrap this program'
 
 dlextract "https://storage.googleapis.com/golang/$name$version.src.tar.gz" \
           '83d1b7bd4281479ab7d153e5152c9fc9'
@@ -49,4 +49,4 @@ done
 echo "export GOPATH=\"$dir_sysroot/$dir_prefix/$dir_libdir/$name/site\"" > go.sh
 install -Dm755 -t "$dir_install/$dir_sysconfdir/profile.d" go.sh
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/gtksourceview2.sat b/satellites/gtksourceview2.sat
index f9200f2..22f9906 100644
--- a/satellites/gtksourceview2.sat
+++ b/satellites/gtksourceview2.sat
@@ -12,4 +12,4 @@ header_end
 cd "$name-$version"
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/hostapd.sat b/satellites/hostapd.sat
index 13347d6..d76f956 100644
--- a/satellites/hostapd.sat
+++ b/satellites/hostapd.sat
@@ -25,4 +25,4 @@ option rtlxdrv echo CONFIG_DRIVER_RTW=y >> .config
 make
 install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "$name" "${name}_cli"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/i3.sat b/satellites/i3.sat
index 2044708..f6b602c 100644
--- a/satellites/i3.sat
+++ b/satellites/i3.sat
@@ -33,4 +33,4 @@ make install \
 make -C man
 install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man1" man/*.1
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/i3lock.sat b/satellites/i3lock.sat
index b44f739..4360ee5 100644
--- a/satellites/i3lock.sat
+++ b/satellites/i3lock.sat
@@ -28,4 +28,4 @@ install -Dm644 -t "$dir_install/$dir_prefix/$dir_mandir/man1/" "$name.1"
 # Don't worry, the locker drops privileges back to your user as soon as possible.
 option !pam chmod +s "$dir_install/$dir_prefix/$dir_bindir/$name"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/i3status.sat b/satellites/i3status.sat
index 5ba910c..05246a6 100644
--- a/satellites/i3status.sat
+++ b/satellites/i3status.sat
@@ -23,4 +23,4 @@ make install \
     SYSCONFDIR="/$dir_sysconfdir" \
     DESTDIR="$dir_install"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/imlib2.sat b/satellites/imlib2.sat
index f05e4d8..8ed7e2e 100644
--- a/satellites/imlib2.sat
+++ b/satellites/imlib2.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_configure -- --disable-static
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/intel-ucode.sat b/satellites/intel-ucode.sat
index de201de..7b7ae8a 100644
--- a/satellites/intel-ucode.sat
+++ b/satellites/intel-ucode.sat
@@ -14,4 +14,4 @@ install -Dm644 microcode.bin kernel/x86/microcode/GenuineIntel.bin
 echo kernel/x86/microcode/GenuineIntel.bin | cpio -o -H newc -R 0:0 > intel-ucode.img
 install -Dm644 -t "$dir_install/boot/" intel-ucode.img
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/json-glib.sat b/satellites/json-glib.sat
index d40eec9..549d363 100644
--- a/satellites/json-glib.sat
+++ b/satellites/json-glib.sat
@@ -12,4 +12,4 @@ header_end
 cd "$name-$version"
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/jstest-gtk-git.sat b/satellites/jstest-gtk-git.sat
index 94b3bc5..075fb69 100644
--- a/satellites/jstest-gtk-git.sat
+++ b/satellites/jstest-gtk-git.sat
@@ -21,4 +21,4 @@ install -Dm644 data/generic.png "$dir_install/$dir_prefix/$dir_datadir/pixmaps/$
 mkdir -p "$dir_install/$dir_prefix/$dir_datadir/$name"
 cp data/*.png "$dir_install/$dir_prefix/$dir_datadir/$name"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/libass.sat b/satellites/libass.sat
index 92c6c43..f1a3333 100644
--- a/satellites/libass.sat
+++ b/satellites/libass.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_configure -- --disable-static
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/libev.sat b/satellites/libev.sat
index 19481c0..9aff35f 100644
--- a/satellites/libev.sat
+++ b/satellites/libev.sat
@@ -15,4 +15,4 @@ sed -i -e '/include_HEADERS/s/event.h//' Makefile.in
 
 compile_configure -- --disable-static
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/libmodplug.sat b/satellites/libmodplug.sat
index 0aaac73..68adf4a 100644
--- a/satellites/libmodplug.sat
+++ b/satellites/libmodplug.sat
@@ -12,4 +12,4 @@ header_end
 cd "$name-$version"
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/libticables-git.sat b/satellites/libticables-git.sat
index 7595117..811c814 100644
--- a/satellites/libticables-git.sat
+++ b/satellites/libticables-git.sat
@@ -10,4 +10,4 @@ cd tilibs/libticables/trunk
 autoreconf -i
 compile_configure -- --enable-libusb10
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/libticalcs-git.sat b/satellites/libticalcs-git.sat
index cc2b8e4..eebd9b3 100644
--- a/satellites/libticalcs-git.sat
+++ b/satellites/libticalcs-git.sat
@@ -10,4 +10,4 @@ cd tilibs/libticalcs/trunk
 autoreconf -i
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/libticonv-git.sat b/satellites/libticonv-git.sat
index 8179cb2..6d5ce64 100644
--- a/satellites/libticonv-git.sat
+++ b/satellites/libticonv-git.sat
@@ -10,4 +10,4 @@ cd tilibs/libticonv/trunk
 autoreconf -i
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/libtifiles-git.sat b/satellites/libtifiles-git.sat
index 3f81a2b..9cee393 100644
--- a/satellites/libtifiles-git.sat
+++ b/satellites/libtifiles-git.sat
@@ -10,4 +10,4 @@ cd tilibs/libtifiles/trunk
 autoreconf -i
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/libtorrent-rasterbar.sat b/satellites/libtorrent-rasterbar.sat
index d6394d2..63ba4c8 100644
--- a/satellites/libtorrent-rasterbar.sat
+++ b/satellites/libtorrent-rasterbar.sat
@@ -15,4 +15,4 @@ export CXXFLAGS="$CXXFLAGS -std=c++11"
 
 compile_configure -- --disable-static --with-libiconv
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/libwebp.sat b/satellites/libwebp.sat
index 2f02a8b..4e555f2 100644
--- a/satellites/libwebp.sat
+++ b/satellites/libwebp.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_configure -- --disable-static
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/libxdg-basedir.sat b/satellites/libxdg-basedir.sat
index 079c653..3259887 100644
--- a/satellites/libxdg-basedir.sat
+++ b/satellites/libxdg-basedir.sat
@@ -16,4 +16,4 @@ patch -p0 -i ../xdgGetRelativeHome-overflow.patch
 autoreconf -i
 compile_configure -- --disable-static
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/libxkbcommon.sat b/satellites/libxkbcommon.sat
index bb22ea0..3ede9fe 100644
--- a/satellites/libxkbcommon.sat
+++ b/satellites/libxkbcommon.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_configure -- --disable-static
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/livestreamer.sat b/satellites/livestreamer.sat
index 07ea26b..224f973 100644
--- a/satellites/livestreamer.sat
+++ b/satellites/livestreamer.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_python 3
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/love.sat b/satellites/love.sat
index e906bcd..f65f2d6 100644
--- a/satellites/love.sat
+++ b/satellites/love.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/lua.sat b/satellites/lua.sat
index 4be14e6..f5f249a 100644
--- a/satellites/lua.sat
+++ b/satellites/lua.sat
@@ -50,4 +50,4 @@ cc src/luac.o src/lopcodes.o src/ldump.o "install/$dir_libdir/liblua.so" $libs -
 mkdir -p "$dir_install/$dir_prefix"
 cp -a install/* "$dir_install/$dir_prefix/"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/luajit.sat b/satellites/luajit.sat
index 873ed0d..d71c553 100644
--- a/satellites/luajit.sat
+++ b/satellites/luajit.sat
@@ -18,4 +18,4 @@ make install \
     INSTALL_SHARE="\$(DPREFIX)/$dir_datadir" \
     INSTALL_MAN="\$(DPREFIX)/$dir_mandir"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/maim.sat b/satellites/maim.sat
index b2797fa..c9a567e 100644
--- a/satellites/maim.sat
+++ b/satellites/maim.sat
@@ -16,4 +16,4 @@ sed -i -e "s/\${CMAKE_INSTALL_PREFIX}\/bin/\${CMAKE_INSTALL_PREFIX}\/$(safe_sed
 # This project doesn't use GNUInstallDir's CMAKE_INSTALL_*
 compile_cmake -- -DCMAKE_INSTALL_MANDIR="/$dir_prefix/$dir_mandir"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/makerom.sat b/satellites/makerom.sat
index 9b76561..8cb87a3 100644
--- a/satellites/makerom.sat
+++ b/satellites/makerom.sat
@@ -11,4 +11,4 @@ cd "$name-$version/makerom"
 make
 install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" makerom
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/mpv.sat b/satellites/mpv.sat
index 2017633..8b0f8a1 100644
--- a/satellites/mpv.sat
+++ b/satellites/mpv.sat
@@ -16,4 +16,4 @@ compile_waf -- \
     --datadir="/$dir_prefix/$dir_datadir" \
     --enable-zsh-comp
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/ninja.sat b/satellites/ninja.sat
index 50d41cd..434e2fb 100644
--- a/satellites/ninja.sat
+++ b/satellites/ninja.sat
@@ -16,4 +16,4 @@ install -Dm644 misc/zsh-completion "$dir_install/$dir_prefix/$dir_datadir/zsh/si
 install -Dm644 misc/ninja.vim "$dir_install/$dir_prefix/$dir_datadir/vim/vimfiles/syntax/$name.vim"
 # Not installing emacs stuff because I have no idea how it works
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/nxengine.sat b/satellites/nxengine.sat
index d663faf..872fb56 100644
--- a/satellites/nxengine.sat
+++ b/satellites/nxengine.sat
@@ -49,4 +49,4 @@ install -Dm755 "$name.sh" "$dir_install/$dir_prefix/$dir_bindir/$name"
 install -Dm644 "$name.png" "$dir_install/$dir_prefix/$dir_datadir/pixmaps/$name.png"
 install -Dm644 "$name.desktop" "$dir_install/$dir_prefix/$dir_datadir/applications/$name.desktop"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/openal.sat b/satellites/openal.sat
index de045f9..f60330b 100644
--- a/satellites/openal.sat
+++ b/satellites/openal.sat
@@ -16,4 +16,4 @@ sed -i -e "/DESTINATION/s/bin/\"$(safe_sed "$dir_bindir")\"/" \
 
 compile_cmake -- -DSHARE_INSTALL_DIR="/$dir_prefix/$dir_datadir"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/p7zip.sat b/satellites/p7zip.sat
index 0ae7002..feb166c 100644
--- a/satellites/p7zip.sat
+++ b/satellites/p7zip.sat
@@ -22,4 +22,4 @@ make install \
     DEST_SHARE_DOC="/$dir_prefix/$dir_docdir/$name" \
     DEST_MAN="/$dir_prefix/$dir_mandir"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/pdnsd.sat b/satellites/pdnsd.sat
index 53f317e..b1e8458 100644
--- a/satellites/pdnsd.sat
+++ b/satellites/pdnsd.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/perl-module-build.sat b/satellites/perl-module-build.sat
index c49c24e..addd9d0 100644
--- a/satellites/perl-module-build.sat
+++ b/satellites/perl-module-build.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_perl
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/physfs.sat b/satellites/physfs.sat
index 08adc78..dbeeb13 100644
--- a/satellites/physfs.sat
+++ b/satellites/physfs.sat
@@ -16,4 +16,4 @@ sed -i -e "/DESTINATION/s/bin/\"$(safe_sed "$dir_bindir")\"/" \
 
 compile_cmake -- -DPHYSFS_BUILD_STATIC=FALSE
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/pidgin-libnotify.sat b/satellites/pidgin-libnotify.sat
index 28d4575..cbc53ad 100644
--- a/satellites/pidgin-libnotify.sat
+++ b/satellites/pidgin-libnotify.sat
@@ -14,4 +14,4 @@ cd "$name-$version"
 patch -p0 -i ../pidgin-libnotify-0.14-libnotify-0.7.patch
 compile_configure -- --disable-static
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/po4a.sat b/satellites/po4a.sat
index 30aec99..d155b4b 100644
--- a/satellites/po4a.sat
+++ b/satellites/po4a.sat
@@ -19,4 +19,4 @@ rmdir blib/man
 # Install the rest
 ./Build install
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/purple-skypeweb.sat b/satellites/purple-skypeweb.sat
index fd12a45..71061f4 100644
--- a/satellites/purple-skypeweb.sat
+++ b/satellites/purple-skypeweb.sat
@@ -11,4 +11,4 @@ cd "$name-$version/skypeweb"
 make
 make DESTDIR="$dir_install" install
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/purple-telegram.sat b/satellites/purple-telegram.sat
index 1ea7614..6f1abcf 100644
--- a/satellites/purple-telegram.sat
+++ b/satellites/purple-telegram.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name"
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/pygtksourceview2.sat b/satellites/pygtksourceview2.sat
index c9ca857..00592a5 100644
--- a/satellites/pygtksourceview2.sat
+++ b/satellites/pygtksourceview2.sat
@@ -12,4 +12,4 @@ header_end
 cd "$name-$version"
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/python3-docutils.sat b/satellites/python3-docutils.sat
index 50f863e..860f5ae 100644
--- a/satellites/python3-docutils.sat
+++ b/satellites/python3-docutils.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_python 3
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/python3-jinja2.sat b/satellites/python3-jinja2.sat
index 3c32026..0f314f5 100644
--- a/satellites/python3-jinja2.sat
+++ b/satellites/python3-jinja2.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_python 3
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/python3-markupsafe.sat b/satellites/python3-markupsafe.sat
index 5b16abd..86350dc 100644
--- a/satellites/python3-markupsafe.sat
+++ b/satellites/python3-markupsafe.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_python 3
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/python3-peg2.sat b/satellites/python3-peg2.sat
index db22d0f..3debe67 100644
--- a/satellites/python3-peg2.sat
+++ b/satellites/python3-peg2.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_python 3
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/python3-pygments.sat b/satellites/python3-pygments.sat
index 6cc421a..d446030 100644
--- a/satellites/python3-pygments.sat
+++ b/satellites/python3-pygments.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_python 3
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/python3-qt5.sat b/satellites/python3-qt5.sat
index a245833..f227ded 100644
--- a/satellites/python3-qt5.sat
+++ b/satellites/python3-qt5.sat
@@ -18,4 +18,4 @@ python3 configure.py --qmake "$qmake" --confirm-license
 make
 make DESTDIR="$dir_install" INSTALL_ROOT="$dir_install" install
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/python3-requests.sat b/satellites/python3-requests.sat
index bfb1af1..8dc3996 100644
--- a/satellites/python3-requests.sat
+++ b/satellites/python3-requests.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_python 3
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/python3-setuptools.sat b/satellites/python3-setuptools.sat
index 6bc7e52..1ef7d2f 100644
--- a/satellites/python3-setuptools.sat
+++ b/satellites/python3-setuptools.sat
@@ -16,4 +16,4 @@ sed -i -e '/easy_install =/d' setup.py
 
 compile_python 3
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/python3-sip.sat b/satellites/python3-sip.sat
index e91c113..9f2feb9 100644
--- a/satellites/python3-sip.sat
+++ b/satellites/python3-sip.sat
@@ -13,4 +13,4 @@ python3 configure.py CFLAGS="$CFLAGS" LFLAGS="$LDFLAGS" --no-tools
 make
 make DESTDIR="$dir_install" install
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/python3-yaml.sat b/satellites/python3-yaml.sat
index 2c8efae..0f82094 100644
--- a/satellites/python3-yaml.sat
+++ b/satellites/python3-yaml.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_python 3
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/python3.sat b/satellites/python3.sat
index 9b688c0..d8a7e81 100644
--- a/satellites/python3.sat
+++ b/satellites/python3.sat
@@ -41,4 +41,4 @@ compile_configure -- \
     --without-ensurepip
 make DESTDIR="$dir_install" maninstall
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/qbittorrent.sat b/satellites/qbittorrent.sat
index 3ccc0b2..8b29e2c 100644
--- a/satellites/qbittorrent.sat
+++ b/satellites/qbittorrent.sat
@@ -16,4 +16,4 @@ compile_configure -I -- \
     $(option qt4 && echo '--with-qt4 --with-qjson=shipped' || echo '--without-qt4')
 make INSTALL_ROOT="$dir_install" install
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/qemu.sat b/satellites/qemu.sat
index 073e99a..df76d7d 100644
--- a/satellites/qemu.sat
+++ b/satellites/qemu.sat
@@ -21,4 +21,4 @@ fi
 
 compile_configure -- $targets
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/qt5-base.sat b/satellites/qt5-base.sat
index cbae1a5..7b53855 100644
--- a/satellites/qt5-base.sat
+++ b/satellites/qt5-base.sat
@@ -56,4 +56,4 @@ for bin in "$dir_install/$dir_prefix/$dir_libdir/$name/bin/"*; do
     ln -s "../$dir_libdir/$name/bin/$(basename "$bin")" "$dir_install/$dir_prefix/$dir_bindir/$(basename "$bin")-$name"
 done
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/qt5-styleplugins-git.sat b/satellites/qt5-styleplugins-git.sat
index 234656c..8026431 100644
--- a/satellites/qt5-styleplugins-git.sat
+++ b/satellites/qt5-styleplugins-git.sat
@@ -10,4 +10,4 @@ header_end
 cd "qt$submodule"
 compile_qt 5
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/qt5-tools.sat b/satellites/qt5-tools.sat
index 6dc8d23..629ae24 100644
--- a/satellites/qt5-tools.sat
+++ b/satellites/qt5-tools.sat
@@ -19,4 +19,4 @@ for bin in "$dir_install/$dir_prefix/$dir_libdir/$name/bin/"*; do
     ln -s "../$dir_libdir/$name/bin/$(basename "$bin")" "$dir_install/$dir_prefix/$dir_bindir/$(basename "$bin")-$name"
 done
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/qt5-webkit.sat b/satellites/qt5-webkit.sat
index 15934d5..02e6468 100644
--- a/satellites/qt5-webkit.sat
+++ b/satellites/qt5-webkit.sat
@@ -14,4 +14,4 @@ header_end
 cd "qt$submodule-opensource-src-$version"
 compile_qt 5
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/qutebrowser.sat b/satellites/qutebrowser.sat
index ad5ed0a..09101e1 100644
--- a/satellites/qutebrowser.sat
+++ b/satellites/qutebrowser.sat
@@ -29,4 +29,4 @@ install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/icons/hicolor/scalable/
 # Install userscripts
 install -Dm755 -t "$dir_install/$dir_prefix/$dir_datadir/$name/userscripts/" misc/userscripts/*
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/radare2-git.sat b/satellites/radare2-git.sat
index 4e0c706..167199b 100644
--- a/satellites/radare2-git.sat
+++ b/satellites/radare2-git.sat
@@ -12,4 +12,4 @@ header_end
 cd "$name"
 compile_configure -- --with-syszip
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/rofi.sat b/satellites/rofi.sat
index 9e089b6..70b030e 100644
--- a/satellites/rofi.sat
+++ b/satellites/rofi.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/rt8192cu-git.sat b/satellites/rt8192cu-git.sat
index ef21edd..9c64d41 100644
--- a/satellites/rt8192cu-git.sat
+++ b/satellites/rt8192cu-git.sat
@@ -15,4 +15,4 @@ install -Dm644 -t "$dir_install/lib/modules/$kver/kernel/drivers/net/wireless" 8
 install -Dm644 blacklist-dkms-8192cu.conf "$dir_install/$dir_sysconfdir/modprobe.d/$name.conf"
 echo 'blacklist rtl8xxxu' >> "$dir_install/$dir_sysconfdir/modprobe.d/$name.conf"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/rxvt-unicode.sat b/satellites/rxvt-unicode.sat
index 45bcfc2..0b72706 100644
--- a/satellites/rxvt-unicode.sat
+++ b/satellites/rxvt-unicode.sat
@@ -13,4 +13,4 @@ export TERMINFO="$dir_install/$dir_prefix/$dir_datadir/terminfo"
 mkdir -p "$TERMINFO"
 compile_configure -- --enable-everything --enable-256-color
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/scrot.sat b/satellites/scrot.sat
index 278fd4d..93cec33 100644
--- a/satellites/scrot.sat
+++ b/satellites/scrot.sat
@@ -21,4 +21,4 @@ done
 autoreconf -i
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/sdl2.sat b/satellites/sdl2.sat
index b2ae21b..9385cde 100644
--- a/satellites/sdl2.sat
+++ b/satellites/sdl2.sat
@@ -27,4 +27,4 @@ compile_configure -- --disable-static \
     --disable-directfb-shared \
     --disable-fusionsound-shared
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/sdl2_image.sat b/satellites/sdl2_image.sat
index b0ac776..86206c6 100644
--- a/satellites/sdl2_image.sat
+++ b/satellites/sdl2_image.sat
@@ -15,4 +15,4 @@ compile_configure -- --disable-static \
     --disable-tif-shared \
     --disable-webp-shared
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/sdl2_mixer.sat b/satellites/sdl2_mixer.sat
index 5829d6b..f1e3b81 100644
--- a/satellites/sdl2_mixer.sat
+++ b/satellites/sdl2_mixer.sat
@@ -18,4 +18,4 @@ compile_configure -- --disable-static \
     --disable-music-flac-shared \
     --disable-music-mp3-smpeg-shared
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/slop.sat b/satellites/slop.sat
index 81ae11f..55b3ce7 100644
--- a/satellites/slop.sat
+++ b/satellites/slop.sat
@@ -15,4 +15,4 @@ sed -i -e "s/\${CMAKE_INSTALL_PREFIX}\/bin/\${CMAKE_INSTALL_PREFIX}\/$(safe_sed
 
 compile_cmake
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/spasm-ng-git.sat b/satellites/spasm-ng-git.sat
index 80b479f..a49bbd0 100644
--- a/satellites/spasm-ng-git.sat
+++ b/satellites/spasm-ng-git.sat
@@ -9,4 +9,4 @@ cd "$name"
 make
 install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" spasm
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/steam.sat b/satellites/steam.sat
index 0b166a6..238f336 100644
--- a/satellites/steam.sat
+++ b/satellites/steam.sat
@@ -20,4 +20,4 @@ sed -i -e "/LAUNCHSTEAMBOOTSTRAPFILE=/s/usr\/lib/$(safe_sed "$dir_prefix/$dir_li
 
 make PREFIX="/$dir_prefix" DESTDIR="$dir_install" install
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/streamlink.sat b/satellites/streamlink.sat
index 54980d4..9e64d38 100644
--- a/satellites/streamlink.sat
+++ b/satellites/streamlink.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_python 3
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/syncthing.sat b/satellites/syncthing.sat
index 16b2abf..4ee8d6e 100644
--- a/satellites/syncthing.sat
+++ b/satellites/syncthing.sat
@@ -28,4 +28,4 @@ done
 # Install desktop
 install -Dm644 -t "$dir_install/$dir_prefix/$dir_datadir/applications" ../../../../syncthing-browser.desktop
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/teeworlds.sat b/satellites/teeworlds.sat
index 507cb96..eba2e16 100644
--- a/satellites/teeworlds.sat
+++ b/satellites/teeworlds.sat
@@ -28,4 +28,4 @@ install -Dm755 "${name}_srv" "$dir_install/$dir_prefix/$dir_bindir/${name}_srv"
 install -Dm644 "$name-0.png" "$dir_install/$dir_prefix/$dir_datadir/pixmaps/$name.png"
 install -Dm644 "../$name.desktop" "$dir_install/$dir_prefix/$dir_datadir/applications/$name.desktop"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/tilp-git.sat b/satellites/tilp-git.sat
index fe620d8..68a2227 100644
--- a/satellites/tilp-git.sat
+++ b/satellites/tilp-git.sat
@@ -10,4 +10,4 @@ cd tilp_and_gfm/tilp/trunk
 autoreconf -i
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/tlp.sat b/satellites/tlp.sat
index 1f2658b..c66590c 100644
--- a/satellites/tlp.sat
+++ b/satellites/tlp.sat
@@ -19,4 +19,4 @@ make install-tlp \
     TLP_NO_INIT=1 \
     DESTDIR="$dir_install"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/unetbootin.sat b/satellites/unetbootin.sat
index 98f40d1..f4d3c83 100644
--- a/satellites/unetbootin.sat
+++ b/satellites/unetbootin.sat
@@ -35,4 +35,4 @@ for x in 16 22 24 32 48 64 128 192 256 512; do
 done
 install -Dm644 "${name}_icons.svg" "$dir_install/$dir_prefix/$dir_datadir/icons/scalable/apps/$name.svg"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/vbindiff.sat b/satellites/vbindiff.sat
index 1231761..15bb9aa 100644
--- a/satellites/vbindiff.sat
+++ b/satellites/vbindiff.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_configure
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/volumeicon.sat b/satellites/volumeicon.sat
index 769e16d..7838134 100644
--- a/satellites/volumeicon.sat
+++ b/satellites/volumeicon.sat
@@ -25,4 +25,4 @@ if option !gtk3; then
 fi
 compile_configure -- --enable-notify
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/waf.sat b/satellites/waf.sat
index 5f3fa11..9679867 100644
--- a/satellites/waf.sat
+++ b/satellites/waf.sat
@@ -34,4 +34,4 @@ install -d "$wafdir"
 unzip -od "$wafdir" zip/waflib.zip
 python3 -OOm compileall "$wafdir"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/webfs.sat b/satellites/webfs.sat
index 29d8211..88f3eb6 100644
--- a/satellites/webfs.sat
+++ b/satellites/webfs.sat
@@ -17,4 +17,4 @@ make
 install -Dm755 -t "$dir_install/$dir_prefix/$dir_bindir" "${name}d"
 install -Dm644 "${name}d.man" "$dir_install/$dir_prefix/$dir_mandir/man1/${name}d.1"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/wine.sat b/satellites/wine.sat
index 6649f3a..6e6b9d0 100644
--- a/satellites/wine.sat
+++ b/satellites/wine.sat
@@ -21,4 +21,4 @@ if [ "$wine32" ]; then
     PKG_CONFIG_PATH="$dir_sysroot/$dir_prefix/$wine32/pkgconfig" compile_configure -b ../build-wine32 -- --with-wine64=../build --libdir="/$dir_prefix/$wine32"
 fi
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/xautolock.sat b/satellites/xautolock.sat
index b99ae11..e12779b 100644
--- a/satellites/xautolock.sat
+++ b/satellites/xautolock.sat
@@ -10,4 +10,4 @@ cd "$name-$version"
 xmkmf
 make DESTDIR="$dir_install" install install.man
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/xcb-util-xrm.sat b/satellites/xcb-util-xrm.sat
index 4564cc6..254dbb2 100644
--- a/satellites/xcb-util-xrm.sat
+++ b/satellites/xcb-util-xrm.sat
@@ -11,4 +11,4 @@ header_end
 cd "$name-$version"
 compile_configure -- --disable-static
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/yajl.sat b/satellites/yajl.sat
index 2530388..e400e29 100644
--- a/satellites/yajl.sat
+++ b/satellites/yajl.sat
@@ -24,4 +24,4 @@ sed -i -e "/DESTINATION/s/bin/\"$(safe_sed "$dir_bindir")\"/" \
 
 compile_cmake
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/youtube-dl.sat b/satellites/youtube-dl.sat
index 64fc8c4..39baa61 100644
--- a/satellites/youtube-dl.sat
+++ b/satellites/youtube-dl.sat
@@ -24,4 +24,4 @@ compile_python 3
 install -Dm644 "$name.bash-completion" "$dir_install/$dir_prefix/$dir_datadir/bash-completion/completions/$name"
 install -Dm644 "$name.zsh" "$dir_install/$dir_prefix/$dir_datadir/zsh/site-functions/_$name"
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab:
diff --git a/satellites/zim.sat b/satellites/zim.sat
index 8979823..b5ebab3 100644
--- a/satellites/zim.sat
+++ b/satellites/zim.sat
@@ -17,4 +17,4 @@ sed -i -e "s/$safe_datadir\/man/$(safe_sed "$dir_mandir")/g" setup.py
 
 compile_python 2 --skip-xdg-cmd
 
-# vim:set tabstop=4 shiftwidth=4 syntax=sh et:
+# vim:set tabstop=4 shiftwidth=4 syntax=sh expandtab: