diff options
| author | Florian Pritz <bluewind@xinu.at> | 2011-06-30 17:07:54 +0200 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2011-06-30 10:44:45 -0500 |
| commit | 9efd10cd2ac9a7654b2c7c94df86bf09ab54f41a (patch) | |
| tree | 2965273aa479462a199bfc40a358072069d14df7 | |
| parent | c2cce4f3f5e0381d107ced3fee3ab0d7240653d1 (diff) | |
fix vim syntax highlighting of .sh files
vim recognises what type of shell script it's dealing with by looking at
the shebang. If detection fails it falls back to sh which doesn't
support some bash features. Adding a normal, possibly broken, shebang
which gets fixed by the Makefile allows vim to detect bash syntax.
Signed-off-by: Florian Pritz <bluewind@xinu.at>
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | contrib/Makefile.am | 2 | ||||
| -rwxr-xr-x | contrib/bacman.in | 2 | ||||
| -rwxr-xr-x | contrib/pacdiff.in | 2 | ||||
| -rwxr-xr-x | contrib/pacscripts.in | 2 | ||||
| -rw-r--r-- | scripts/Makefile.am | 2 | ||||
| -rw-r--r-- | scripts/makepkg.sh.in | 2 | ||||
| -rw-r--r-- | scripts/pacman-db-upgrade.sh.in | 2 | ||||
| -rw-r--r-- | scripts/pacman-key.sh.in | 2 | ||||
| -rw-r--r-- | scripts/pacman-optimize.sh.in | 2 | ||||
| -rw-r--r-- | scripts/pkgdelta.sh.in | 2 | ||||
| -rw-r--r-- | scripts/rankmirrors.sh.in | 2 | ||||
| -rw-r--r-- | scripts/repo-add.sh.in | 2 |
12 files changed, 12 insertions, 12 deletions
diff --git a/contrib/Makefile.am b/contrib/Makefile.am index e9f77940..cba2085c 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -27,7 +27,7 @@ MOSTLYCLEANFILES = $(OURSCRIPTS) $(OURFILES) *.tmp edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ - -e 's|@BASH_SHELL[@]|$(BASH_SHELL)|g' + -e '1s|!/bin/bash|!$(BASH_SHELL)|g' $(OURSCRIPTS): Makefile @echo ' ' GEN $@; diff --git a/contrib/bacman.in b/contrib/bacman.in index ebcc386d..fe13e5b9 100755 --- a/contrib/bacman.in +++ b/contrib/bacman.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # bacman: recreate a package from a running system # This script rebuilds an already installed package using metadata diff --git a/contrib/pacdiff.in b/contrib/pacdiff.in index ac4ce893..3f26f381 100755 --- a/contrib/pacdiff.in +++ b/contrib/pacdiff.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # pacdiff : a simple pacnew/pacorig/pacsave updater # # Copyright (c) 2007 Aaron Griffin <aaronmgriffin@gmail.com> diff --git a/contrib/pacscripts.in b/contrib/pacscripts.in index 8ad5173b..37d3feae 100755 --- a/contrib/pacscripts.in +++ b/contrib/pacscripts.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # pacscripts : tries to print out the {pre,post}_{install,remove,upgrade} # scripts of a given package diff --git a/scripts/Makefile.am b/scripts/Makefile.am index e34c3005..8491b743 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -47,7 +47,7 @@ edit = sed \ -e 's|@sysconfdir[@]|$(sysconfdir)|g' \ -e 's|@localstatedir[@]|$(localstatedir)|g' \ -e 's|@prefix[@]|$(prefix)|g' \ - -e 's|@BASH_SHELL[@]|$(BASH_SHELL)|g' \ + -e '1s|!/bin/bash|!$(BASH_SHELL)|g' \ -e 's|@PACKAGE_VERSION[@]|$(REAL_PACKAGE_VERSION)|g' \ -e 's|@PACKAGE_BUGREPORT[@]|$(PACKAGE_BUGREPORT)|g' \ -e 's|@PACKAGE_NAME[@]|$(PACKAGE_NAME)|g' \ diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 98bed3e2..1b132a98 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ -e +#!/bin/bash -e # # makepkg - make packages compatible for use with pacman # @configure_input@ diff --git a/scripts/pacman-db-upgrade.sh.in b/scripts/pacman-db-upgrade.sh.in index fa4cb2b4..3e0d702d 100644 --- a/scripts/pacman-db-upgrade.sh.in +++ b/scripts/pacman-db-upgrade.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ -e +#!/bin/bash -e # # pacman-db-upgrade - upgrade the local pacman db to a newer format # @configure_input@ diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in index 7cdb6837..877cca29 100644 --- a/scripts/pacman-key.sh.in +++ b/scripts/pacman-key.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ -e +#!/bin/bash -e # # pacman-key - manages pacman's keyring # Based on apt-key, from Debian diff --git a/scripts/pacman-optimize.sh.in b/scripts/pacman-optimize.sh.in index 0dc32bfc..5ff302e2 100644 --- a/scripts/pacman-optimize.sh.in +++ b/scripts/pacman-optimize.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # pacman-optimize # @configure_input@ diff --git a/scripts/pkgdelta.sh.in b/scripts/pkgdelta.sh.in index c8b8a1fd..46c6f4ff 100644 --- a/scripts/pkgdelta.sh.in +++ b/scripts/pkgdelta.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # pkgdelta - create delta files for use with pacman and repo-add # @configure_input@ diff --git a/scripts/rankmirrors.sh.in b/scripts/rankmirrors.sh.in index 64d5a73c..a0ff6d5d 100644 --- a/scripts/rankmirrors.sh.in +++ b/scripts/rankmirrors.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # rankmirrors - read a list of mirrors from a file and rank them by speed # @configure_input@ diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in index 0500b48c..415ad41f 100644 --- a/scripts/repo-add.sh.in +++ b/scripts/repo-add.sh.in @@ -1,4 +1,4 @@ -#!@BASH_SHELL@ +#!/bin/bash # # repo-add - add a package to a given repo database file # repo-remove - remove a package entry from a given repo database file |