From 85108e958ba05c10c19f08345eeafe2c316f2645 Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Mon, 22 May 2023 15:29:27 +0200 Subject: [PATCH] Fix vim modelines and make more readable Add missing trailing : Use filetype=sh instead of ft=sh to make it more readable. --- bin/imds | 2 +- dist/openrc/tiny-cloud-boot | 2 +- dist/openrc/tiny-cloud-early | 2 +- dist/openrc/tiny-cloud-final | 2 +- dist/openrc/tiny-cloud-main | 2 +- lib/mdev/nvme-ebs-links | 2 +- lib/mdev/vnic-eth-hotplug | 2 +- lib/tiny-cloud/cloud/alpine/init | 2 +- lib/tiny-cloud/cloud/aws/imds | 2 +- lib/tiny-cloud/cloud/aws/mdev | 2 +- lib/tiny-cloud/cloud/azure/imds | 2 +- lib/tiny-cloud/cloud/gcp/imds | 2 +- lib/tiny-cloud/cloud/nocloud/imds | 2 +- lib/tiny-cloud/cloud/oci/imds | 2 +- lib/tiny-cloud/common | 2 +- lib/tiny-cloud/init | 2 +- lib/tiny-cloud/mdev | 2 +- lib/tiny-cloud/user-data/alpine-config | 2 +- lib/tiny-cloud/user-data/cloud-config | 2 +- lib/tiny-cloud/user-data/missing | 2 +- lib/tiny-cloud/user-data/script | 2 +- lib/tiny-cloud/user-data/unknown | 2 +- sbin/assemble-interfaces | 2 +- sbin/imds-net-sync | 2 +- sbin/tiny-cloud | 2 +- tests/assemble-interfaces.test | 2 +- tests/fake-wget.test | 2 +- tests/imds.test | 2 +- tests/init.test | 2 +- tests/tiny-cloud-alpine.test | 2 +- tests/tiny-cloud.test | 2 +- usr/libexec/ifupdown-ng/imds | 2 +- 32 files changed, 32 insertions(+), 32 deletions(-) diff --git a/bin/imds b/bin/imds index 45b6d40..83f7202 100755 --- a/bin/imds +++ b/bin/imds @@ -1,5 +1,5 @@ #!/bin/sh -# vim:set ft=sh: +# vim:set filetype=sh: # Tiny Cloud - Instance MetaData Service client diff --git a/dist/openrc/tiny-cloud-boot b/dist/openrc/tiny-cloud-boot index 586a572..c93970d 100755 --- a/dist/openrc/tiny-cloud-boot +++ b/dist/openrc/tiny-cloud-boot @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh description="Tiny Cloud Bootstrap - boot phase" diff --git a/dist/openrc/tiny-cloud-early b/dist/openrc/tiny-cloud-early index 4da0545..c854144 100755 --- a/dist/openrc/tiny-cloud-early +++ b/dist/openrc/tiny-cloud-early @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh description="Tiny Cloud Bootstrap - early phase" diff --git a/dist/openrc/tiny-cloud-final b/dist/openrc/tiny-cloud-final index 69fe797..b9957e3 100755 --- a/dist/openrc/tiny-cloud-final +++ b/dist/openrc/tiny-cloud-final @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh description="Tiny Cloud Bootstrap - final phase" diff --git a/dist/openrc/tiny-cloud-main b/dist/openrc/tiny-cloud-main index a31234e..e0721a2 100755 --- a/dist/openrc/tiny-cloud-main +++ b/dist/openrc/tiny-cloud-main @@ -1,5 +1,5 @@ #!/sbin/openrc-run -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh description="Tiny Cloud Bootstrap - main phase" diff --git a/lib/mdev/nvme-ebs-links b/lib/mdev/nvme-ebs-links index 5b96d56..fc7b49b 100755 --- a/lib/mdev/nvme-ebs-links +++ b/lib/mdev/nvme-ebs-links @@ -1,5 +1,5 @@ #!/bin/sh -# vim:set ft=sh: +# vim:set filetype=sh: # NOTE: The mdev-conf APK handles this now, but only for xvd or sd links (not # both) diff --git a/lib/mdev/vnic-eth-hotplug b/lib/mdev/vnic-eth-hotplug index 72fb947..68e7214 100755 --- a/lib/mdev/vnic-eth-hotplug +++ b/lib/mdev/vnic-eth-hotplug @@ -1,5 +1,5 @@ #!/bin/sh -# vim:set ft=sh: +# vim:set filetype=sh: set -e diff --git a/lib/tiny-cloud/cloud/alpine/init b/lib/tiny-cloud/cloud/alpine/init index 787b992..8052c08 100644 --- a/lib/tiny-cloud/cloud/alpine/init +++ b/lib/tiny-cloud/cloud/alpine/init @@ -1,5 +1,5 @@ # Tiny Cloud - Init Functions -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh INIT_ACTIONS_BOOT="$(replace_word set_default_interfaces set_network_interfaces $INIT_ACTIONS_BOOT)" diff --git a/lib/tiny-cloud/cloud/aws/imds b/lib/tiny-cloud/cloud/aws/imds index 31daef3..f7b877d 100644 --- a/lib/tiny-cloud/cloud/aws/imds +++ b/lib/tiny-cloud/cloud/aws/imds @@ -1,5 +1,5 @@ # AWS Instance MetaData Service variables and functions -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh IMDS_HEADER="X-aws-ec2-metadata-token" diff --git a/lib/tiny-cloud/cloud/aws/mdev b/lib/tiny-cloud/cloud/aws/mdev index 8ddd8a2..7973363 100644 --- a/lib/tiny-cloud/cloud/aws/mdev +++ b/lib/tiny-cloud/cloud/aws/mdev @@ -1,5 +1,5 @@ # AWS mdev Hotplug Modules -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh # makes symlinks for NVMe devices that correlate to AWS EBS sd/xvd devices diff --git a/lib/tiny-cloud/cloud/azure/imds b/lib/tiny-cloud/cloud/azure/imds index 8781b49..d17d474 100644 --- a/lib/tiny-cloud/cloud/azure/imds +++ b/lib/tiny-cloud/cloud/azure/imds @@ -1,5 +1,5 @@ # Azure Instance MetaData Service variables and functions -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh IMDS_HEADER="Metadata" diff --git a/lib/tiny-cloud/cloud/gcp/imds b/lib/tiny-cloud/cloud/gcp/imds index f6b1919..56853fb 100644 --- a/lib/tiny-cloud/cloud/gcp/imds +++ b/lib/tiny-cloud/cloud/gcp/imds @@ -1,5 +1,5 @@ # Google Cloud Instance MetaData Service variables and functions -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh IMDS_HEADER="Metadata-Flavor" diff --git a/lib/tiny-cloud/cloud/nocloud/imds b/lib/tiny-cloud/cloud/nocloud/imds index 636ec2c..f689055 100644 --- a/lib/tiny-cloud/cloud/nocloud/imds +++ b/lib/tiny-cloud/cloud/nocloud/imds @@ -1,5 +1,5 @@ # NoCloud Instance Metadata -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh NOCLOUD_FILES="meta-data user-data vendor-data network-config" diff --git a/lib/tiny-cloud/cloud/oci/imds b/lib/tiny-cloud/cloud/oci/imds index af94d68..c7ea505 100644 --- a/lib/tiny-cloud/cloud/oci/imds +++ b/lib/tiny-cloud/cloud/oci/imds @@ -1,5 +1,5 @@ # OCI Instance MetaData Service variables and functions -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh IMDS_HEADER="Authorization" diff --git a/lib/tiny-cloud/common b/lib/tiny-cloud/common index 164561e..1572d68 100644 --- a/lib/tiny-cloud/common +++ b/lib/tiny-cloud/common @@ -1,5 +1,5 @@ # Tiny Cloud - common script functions -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh # set defaults diff --git a/lib/tiny-cloud/init b/lib/tiny-cloud/init index 1834dcd..7685914 100644 --- a/lib/tiny-cloud/init +++ b/lib/tiny-cloud/init @@ -1,5 +1,5 @@ # Tiny Cloud - Init Functions -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh # set defaults diff --git a/lib/tiny-cloud/mdev b/lib/tiny-cloud/mdev index 70e90dd..f4640d2 100644 --- a/lib/tiny-cloud/mdev +++ b/lib/tiny-cloud/mdev @@ -1,5 +1,5 @@ # Tiny Cloud - mdev hotplug functions -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh # generic helper function to install mdev rules diff --git a/lib/tiny-cloud/user-data/alpine-config b/lib/tiny-cloud/user-data/alpine-config index 03e0075..a54171a 100644 --- a/lib/tiny-cloud/user-data/alpine-config +++ b/lib/tiny-cloud/user-data/alpine-config @@ -1,5 +1,5 @@ # Script UserData Functions -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh INIT_ACTIONS_MAIN="$(insert_before create_default_user userdata_user $INIT_ACTIONS_MAIN)" diff --git a/lib/tiny-cloud/user-data/cloud-config b/lib/tiny-cloud/user-data/cloud-config index 78bd42b..adf4f46 100644 --- a/lib/tiny-cloud/user-data/cloud-config +++ b/lib/tiny-cloud/user-data/cloud-config @@ -1,5 +1,5 @@ # CloudConfig UserData Functions -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh # TODO diff --git a/lib/tiny-cloud/user-data/missing b/lib/tiny-cloud/user-data/missing index 80f0ac2..e517bd3 100644 --- a/lib/tiny-cloud/user-data/missing +++ b/lib/tiny-cloud/user-data/missing @@ -1,5 +1,5 @@ # Missing UserData Functions -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh init__missing_userdata() { diff --git a/lib/tiny-cloud/user-data/script b/lib/tiny-cloud/user-data/script index 7c94cf6..c44e48d 100644 --- a/lib/tiny-cloud/user-data/script +++ b/lib/tiny-cloud/user-data/script @@ -1,5 +1,5 @@ # Script UserData Functions -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh init__run_userdata() { diff --git a/lib/tiny-cloud/user-data/unknown b/lib/tiny-cloud/user-data/unknown index 6cfe4b7..f61cb17 100644 --- a/lib/tiny-cloud/user-data/unknown +++ b/lib/tiny-cloud/user-data/unknown @@ -1,5 +1,5 @@ # Unknown UserData Functions -# vim:set ft=sh: +# vim:set filetype=sh: # shellcheck shell=sh init__unknown_userdata() { diff --git a/sbin/assemble-interfaces b/sbin/assemble-interfaces index 15b4cdc..276d8f6 100755 --- a/sbin/assemble-interfaces +++ b/sbin/assemble-interfaces @@ -1,5 +1,5 @@ #!/bin/sh -# vim:set ft=sh: +# vim:set filetype=sh: set -e diff --git a/sbin/imds-net-sync b/sbin/imds-net-sync index af373fc..8ae7eae 100755 --- a/sbin/imds-net-sync +++ b/sbin/imds-net-sync @@ -1,5 +1,5 @@ #!/bin/sh -# vim:set ft=sh: +# vim:set filetype=sh: # Sync interface's network configuration with IMDS diff --git a/sbin/tiny-cloud b/sbin/tiny-cloud index 020f274..4e80a61 100755 --- a/sbin/tiny-cloud +++ b/sbin/tiny-cloud @@ -1,5 +1,5 @@ #!/bin/sh -# vim:set ft=sh: +# vim:set filetype=sh: # Tiny Cloud diff --git a/tests/assemble-interfaces.test b/tests/assemble-interfaces.test index 64343eb..077ec62 100755 --- a/tests/assemble-interfaces.test +++ b/tests/assemble-interfaces.test @@ -1,5 +1,5 @@ #!/usr/bin/env atf-sh -# vim:set ft=sh +# vim:set filetype=sh: # shellcheck shell=sh . $(atf_get_srcdir)/test_env.sh diff --git a/tests/fake-wget.test b/tests/fake-wget.test index 7e6749a..41b5cc3 100755 --- a/tests/fake-wget.test +++ b/tests/fake-wget.test @@ -1,5 +1,5 @@ #!/usr/bin/env atf-sh -# vim:set ft=sh +# vim:set filetype=sh: # shellcheck shell=sh . $(atf_get_srcdir)/test_env.sh diff --git a/tests/imds.test b/tests/imds.test index 7c76613..025ab10 100755 --- a/tests/imds.test +++ b/tests/imds.test @@ -1,5 +1,5 @@ #!/usr/bin/env atf-sh -# vim:set ft=sh +# vim:set filetype=sh: # shellcheck shell=sh . $(atf_get_srcdir)/test_env.sh diff --git a/tests/init.test b/tests/init.test index 52f58d7..2ac4d6f 100755 --- a/tests/init.test +++ b/tests/init.test @@ -1,5 +1,5 @@ #!/usr/bin/env atf-sh -# vim:set ft=sh +# vim:set filetype=sh: # shellcheck shell=sh . $(atf_get_srcdir)/test_env.sh diff --git a/tests/tiny-cloud-alpine.test b/tests/tiny-cloud-alpine.test index 6a8ccc3..2a0ab9c 100755 --- a/tests/tiny-cloud-alpine.test +++ b/tests/tiny-cloud-alpine.test @@ -1,5 +1,5 @@ #!/usr/bin/env atf-sh -# vim:set ft=sh +# vim:set filetype=sh: # shellcheck shell=sh . $(atf_get_srcdir)/test_env.sh diff --git a/tests/tiny-cloud.test b/tests/tiny-cloud.test index f65852b..b996f1c 100755 --- a/tests/tiny-cloud.test +++ b/tests/tiny-cloud.test @@ -1,5 +1,5 @@ #!/usr/bin/env atf-sh -# vim:set ft=sh +# vim:set filetype=sh: # shellcheck shell=sh . $(atf_get_srcdir)/test_env.sh diff --git a/usr/libexec/ifupdown-ng/imds b/usr/libexec/ifupdown-ng/imds index 4864574..c24fed5 100755 --- a/usr/libexec/ifupdown-ng/imds +++ b/usr/libexec/ifupdown-ng/imds @@ -1,5 +1,5 @@ #!/bin/sh -# vim:set ft=sh: +# vim:set filetype=sh: # Tiny Cloud IMDS ifupdown-ng executor