[pacman-dev] [PATCH 1/2] Remove Vim modelines in prototype files
From: "Jason St. John" <jstjohn@purdue.edu> It makes little sense to "force" users to replace tabs with spaces, with a width of 2. These settings should be configured by the user in their own ~/.vimrc. This is a resubmission based on Allan's feedback on the ML. Signed-off-by: Jason St. John <jstjohn@purdue.edu> --- proto/PKGBUILD.proto | 2 -- proto/proto.install | 2 -- 2 files changed, 4 deletions(-) diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 98172d8..6e788c1 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -43,5 +43,3 @@ package() { cd "$srcdir/$pkgname-$pkgver" make DESTDIR="$pkgdir/" install } - -# vim:set ts=2 sw=2 et: diff --git a/proto/proto.install b/proto/proto.install index 2a8993d..26d37f8 100644 --- a/proto/proto.install +++ b/proto/proto.install @@ -33,5 +33,3 @@ #post_remove() { # do something here #} - -# vim:set ts=2 sw=2 et: -- 1.8.0
From: "Jason St. John" <jstjohn@purdue.edu> The previous commit removed the Vim modelines which replaced tabs with spaces. This commit replaces the space-based indents with tabs. Tabs are generally more compatible with various user preferences regarding indentation of code. Using space-based indents is not flexible regarding user preferences at all. Signed-off-by: Jason St. John <jstjohn@purdue.edu> --- proto/PKGBUILD-split.proto | 58 +++++++++++++++++++++++----------------------- proto/PKGBUILD.proto | 14 +++++------ proto/proto.install | 12 +++++----- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index f873db6..42c469c 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -29,44 +29,44 @@ noextract=() md5sums=() #generate with 'makepkg -g' build() { - cd "$srcdir/$pkgbase-$pkgver" - ./configure --prefix=/usr - make + cd "$srcdir/$pkgbase-$pkgver" + ./configure --prefix=/usr + make } check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check + cd "$srcdir/$pkgname-$pkgver" + make -k check } package_pkg1() { - # options and directives that can be overridden - pkgver= - pkgrel= - epoch= - pkgdesc="" - arch=() - url="" - license=() - groups=() - depends=() - optdepends=() - provides=() - conflicts=() - replaces=() - backup=() - options=() - install= - changelog= + # options and directives that can be overridden + pkgver= + pkgrel= + epoch= + pkgdesc="" + arch=() + url="" + license=() + groups=() + depends=() + optdepends=() + provides=() + conflicts=() + replaces=() + backup=() + options=() + install= + changelog= - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir/" install-pkg1 + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir/" install-pkg1 } package_pkg2() { - # options and directives overrides - pkgdesc="" + # options and directives overrides + pkgdesc="" - cd "$srcdir/$pkgbase-$pkgver" - make DESTDIR="$pkgdir/" install-pkg2 + cd "$srcdir/$pkgbase-$pkgver" + make DESTDIR="$pkgdir/" install-pkg2 } diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 6e788c1..8e9ae04 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -29,17 +29,17 @@ noextract=() md5sums=() #generate with 'makepkg -g' build() { - cd "$srcdir/$pkgname-$pkgver" - ./configure --prefix=/usr - make + cd "$srcdir/$pkgname-$pkgver" + ./configure --prefix=/usr + make } check() { - cd "$srcdir/$pkgname-$pkgver" - make -k check + cd "$srcdir/$pkgname-$pkgver" + make -k check } package() { - cd "$srcdir/$pkgname-$pkgver" - make DESTDIR="$pkgdir/" install + cd "$srcdir/$pkgname-$pkgver" + make DESTDIR="$pkgdir/" install } diff --git a/proto/proto.install b/proto/proto.install index 26d37f8..f7f593f 100644 --- a/proto/proto.install +++ b/proto/proto.install @@ -4,32 +4,32 @@ ## arg 1: the new package version #pre_install() { - # do something here + # do something here #} ## arg 1: the new package version #post_install() { - # do something here + # do something here #} ## arg 1: the new package version ## arg 2: the old package version #pre_upgrade() { - # do something here + # do something here #} ## arg 1: the new package version ## arg 2: the old package version #post_upgrade() { - # do something here + # do something here #} ## arg 1: the old package version #pre_remove() { - # do something here + # do something here #} ## arg 1: the old package version #post_remove() { - # do something here + # do something here #} -- 1.8.0
participants (1)
-
Jason St. John