[arch-projects] [abs] [PATCH 2/2] Replace space-based indents in prototypes with tabs
Jason St. John
jstjohn at purdue.edu
Fri Nov 16 19:14:29 EST 2012
From: "Jason St. John" <jstjohn at 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.
Also, by default, Vim does not replace tabs with spaces, so this makes
the prototypes more consistent with a fresh installation of Vim.
Signed-off-by: Jason St. John <jstjohn at purdue.edu>
---
prototypes/PKGBUILD-bzr.proto | 50 ++++++++++++++++++-------------------
prototypes/PKGBUILD-cvs.proto | 52 +++++++++++++++++++--------------------
prototypes/PKGBUILD-darcs.proto | 46 +++++++++++++++++-----------------
prototypes/PKGBUILD-git.proto | 50 ++++++++++++++++++-------------------
prototypes/PKGBUILD-gnome.proto | 20 +++++++--------
prototypes/PKGBUILD-hg.proto | 52 +++++++++++++++++++--------------------
prototypes/PKGBUILD-perl.proto | 22 ++++++++---------
prototypes/PKGBUILD-python.proto | 4 +--
prototypes/PKGBUILD-rubygem.proto | 12 ++++-----
prototypes/PKGBUILD-svn.proto | 48 ++++++++++++++++++------------------
prototypes/proto-gnome.install | 12 ++++-----
prototypes/proto-haskell.install | 8 +++---
prototypes/proto-info.install | 18 +++++++-------
13 files changed, 197 insertions(+), 197 deletions(-)
diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto
index 32f1064..d1ce933 100644
--- a/prototypes/PKGBUILD-bzr.proto
+++ b/prototypes/PKGBUILD-bzr.proto
@@ -31,32 +31,32 @@ _bzrtrunk=BZRURL
_bzrmod=MODNAME
build() {
- cd "$srcdir"
- msg "Connecting to Bazaar server...."
-
- if [[ -d "$_bzrmod" ]]; then
- cd "$_bzrmod" && bzr --no-plugins pull "$_bzrtrunk" -r "$pkgver"
- msg "The local files are updated."
- else
- bzr --no-plugins branch "$_bzrtrunk" "$_bzrmod" -q -r "$pkgver"
- fi
-
- msg "Bazaar checkout done or server timeout"
- msg "Starting build..."
-
- rm -rf "$srcdir/$_bzrmod-build"
- cp -r "$srcdir/$_bzrmod" "$srcdir/$_bzrmod-build"
- cd "$srcdir/$_bzrmod-build"
-
- #
- # BUILD HERE
- #
- ./autogen.sh
- ./configure --prefix=/usr
- make
+ cd "$srcdir"
+ msg "Connecting to Bazaar server...."
+
+ if [[ -d "$_bzrmod" ]]; then
+ cd "$_bzrmod" && bzr --no-plugins pull "$_bzrtrunk" -r "$pkgver"
+ msg "The local files are updated."
+ else
+ bzr --no-plugins branch "$_bzrtrunk" "$_bzrmod" -q -r "$pkgver"
+ fi
+
+ msg "Bazaar checkout done or server timeout"
+ msg "Starting build..."
+
+ rm -rf "$srcdir/$_bzrmod-build"
+ cp -r "$srcdir/$_bzrmod" "$srcdir/$_bzrmod-build"
+ cd "$srcdir/$_bzrmod-build"
+
+ #
+ # BUILD HERE
+ #
+ ./autogen.sh
+ ./configure --prefix=/usr
+ make
}
package() {
- cd "$srcdir/$_bzrmod-build"
- make DESTDIR="$pkgdir/" install
+ cd "$srcdir/$_bzrmod-build"
+ make DESTDIR="$pkgdir/" install
}
diff --git a/prototypes/PKGBUILD-cvs.proto b/prototypes/PKGBUILD-cvs.proto
index 426331f..f959aae 100644
--- a/prototypes/PKGBUILD-cvs.proto
+++ b/prototypes/PKGBUILD-cvs.proto
@@ -31,33 +31,33 @@ _cvsroot=CVSROOT
_cvsmod=MODNAME
build() {
- cd "$srcdir"
- msg "Connecting to $_cvsmod.sourceforge.net CVS server...."
-
- if [[ -d "$_cvsmod/CVS" ]]; then
- cd "$_cvsmod"
- cvs -z3 update -d
- else
- cvs -z3 -d "$_cvsroot" co -D "$pkgver" -f "$_cvsmod"
- cd "$_cvsmod"
- fi
-
- msg "CVS checkout done or server timeout"
- msg "Starting build..."
-
- rm -rf "$srcdir/$_cvsmod-build"
- cp -r "$srcdir/$_cvsmod" "$srcdir/$_cvsmod-build"
- cd "$srcdir/$_cvsmod-build"
-
- #
- # BUILD HERE
- #
- ./autogen.sh
- ./configure --prefix=/usr
- make
+ cd "$srcdir"
+ msg "Connecting to $_cvsmod.sourceforge.net CVS server...."
+
+ if [[ -d "$_cvsmod/CVS" ]]; then
+ cd "$_cvsmod"
+ cvs -z3 update -d
+ else
+ cvs -z3 -d "$_cvsroot" co -D "$pkgver" -f "$_cvsmod"
+ cd "$_cvsmod"
+ fi
+
+ msg "CVS checkout done or server timeout"
+ msg "Starting build..."
+
+ rm -rf "$srcdir/$_cvsmod-build"
+ cp -r "$srcdir/$_cvsmod" "$srcdir/$_cvsmod-build"
+ cd "$srcdir/$_cvsmod-build"
+
+ #
+ # BUILD HERE
+ #
+ ./autogen.sh
+ ./configure --prefix=/usr
+ make
}
package() {
- cd "$srcdir/$_cvsmod-build"
- make DESTDIR="$pkgdir/" install
+ cd "$srcdir/$_cvsmod-build"
+ make DESTDIR="$pkgdir/" install
}
diff --git a/prototypes/PKGBUILD-darcs.proto b/prototypes/PKGBUILD-darcs.proto
index 4fb852a..b36566e 100644
--- a/prototypes/PKGBUILD-darcs.proto
+++ b/prototypes/PKGBUILD-darcs.proto
@@ -31,34 +31,34 @@ _darcstrunk=DARCSURL
_darcsmod=MODNAME
build() {
- cd "$srcdir"
- msg "Checking for previous build...."
+ cd "$srcdir"
+ msg "Checking for previous build...."
- if [[ -d "$_darcsmod/_darcs" ]]; then
- msg "Retrieving missing patches"
- cd "$_darcsmod"
- darcs pull -a "$_darcstrunk/$_darcsmod"
- else
- msg "Retrieving complete sources"
- darcs get --partial --set-scripts-executable "$_darcstrunk/$_darcsmod"
- cd "$_darcsmod"
- fi
+ if [[ -d "$_darcsmod/_darcs" ]]; then
+ msg "Retrieving missing patches"
+ cd "$_darcsmod"
+ darcs pull -a "$_darcstrunk/$_darcsmod"
+ else
+ msg "Retrieving complete sources"
+ darcs get --partial --set-scripts-executable "$_darcstrunk/$_darcsmod"
+ cd "$_darcsmod"
+ fi
- rm -rf "$srcdir/$_darcsmod-build"
- cp -r "$srcdir/$_darcsmod" "$srcdir/$_darcsmod-build"
- cd "$srcdir/$_darcsmod-build"
+ rm -rf "$srcdir/$_darcsmod-build"
+ cp -r "$srcdir/$_darcsmod" "$srcdir/$_darcsmod-build"
+ cd "$srcdir/$_darcsmod-build"
- msg "Starting build..."
+ msg "Starting build..."
- #
- # BUILD HERE
- #
- ./autogen.sh
- ./configure --prefix=/usr
- make
+ #
+ # BUILD HERE
+ #
+ ./autogen.sh
+ ./configure --prefix=/usr
+ make
}
package() {
- cd "$srcdir/$_darcsmod-build"
- make DESTDIR="$pkgdir/" install
+ cd "$srcdir/$_darcsmod-build"
+ make DESTDIR="$pkgdir/" install
}
diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto
index 4f14e64..78827b1 100644
--- a/prototypes/PKGBUILD-git.proto
+++ b/prototypes/PKGBUILD-git.proto
@@ -31,32 +31,32 @@ _gitroot=GITURL
_gitname=MODENAME
build() {
- cd "$srcdir"
- msg "Connecting to GIT server...."
-
- if [[ -d "$_gitname" ]]; then
- cd "$_gitname" && git pull origin
- msg "The local files are updated."
- else
- git clone "$_gitroot" "$_gitname"
- fi
-
- msg "GIT checkout done or server timeout"
- msg "Starting build..."
-
- rm -rf "$srcdir/$_gitname-build"
- git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
- cd "$srcdir/$_gitname-build"
-
- #
- # BUILD HERE
- #
- ./autogen.sh
- ./configure --prefix=/usr
- make
+ cd "$srcdir"
+ msg "Connecting to GIT server...."
+
+ if [[ -d "$_gitname" ]]; then
+ cd "$_gitname" && git pull origin
+ msg "The local files are updated."
+ else
+ git clone "$_gitroot" "$_gitname"
+ fi
+
+ msg "GIT checkout done or server timeout"
+ msg "Starting build..."
+
+ rm -rf "$srcdir/$_gitname-build"
+ git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
+ cd "$srcdir/$_gitname-build"
+
+ #
+ # BUILD HERE
+ #
+ ./autogen.sh
+ ./configure --prefix=/usr
+ make
}
package() {
- cd "$srcdir/$_gitname-build"
- make DESTDIR="$pkgdir/" install
+ cd "$srcdir/$_gitname-build"
+ make DESTDIR="$pkgdir/" install
}
diff --git a/prototypes/PKGBUILD-gnome.proto b/prototypes/PKGBUILD-gnome.proto
index ac71b79..aa163e8 100644
--- a/prototypes/PKGBUILD-gnome.proto
+++ b/prototypes/PKGBUILD-gnome.proto
@@ -28,18 +28,18 @@ noextract=()
md5sums=() #generate with 'makepkg -g'
build() {
- cd "$srcdir/$pkgname-$pkgver"
- ./configure --prefix=/usr --sysconfdir=/etc \
- --localstatedir=/var --disable-scrollkeeper
- make
+ cd "$srcdir/$pkgname-$pkgver"
+ ./configure --prefix=/usr --sysconfdir=/etc \
+ --localstatedir=/var --disable-scrollkeeper
+ make
}
package() {
- cd "$srcdir/$pkgname-$pkgver"
- make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir/" install
+ cd "$srcdir/$pkgname-$pkgver"
+ make -j1 GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir/" install
- install -m755 -d "$pkgdir/usr/share/gconf/schemas"
- gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" \
- "$pkgdir"/etc/gconf/schemas/*.schemas
- rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
+ install -m755 -d "$pkgdir/usr/share/gconf/schemas"
+ gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/$pkgname.schemas" \
+ "$pkgdir"/etc/gconf/schemas/*.schemas
+ rm -f "$pkgdir"/etc/gconf/schemas/*.schemas
}
diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto
index e486d6d..73eb057 100644
--- a/prototypes/PKGBUILD-hg.proto
+++ b/prototypes/PKGBUILD-hg.proto
@@ -31,33 +31,33 @@ _hgroot=HGURL
_hgrepo=REPONAME
build() {
- cd "$srcdir"
- msg "Connecting to Mercurial server...."
-
- if [[ -d "$_hgrepo" ]]; then
- cd "$_hgrepo"
- hg pull -u
- msg "The local files are updated."
- else
- hg clone "$_hgroot" "$_hgrepo"
- fi
-
- msg "Mercurial checkout done or server timeout"
- msg "Starting build..."
-
- rm -rf "$srcdir/$_hgrepo-build"
- cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
- cd "$srcdir/$_hgrepo-build"
-
- #
- # BUILD HERE
- #
- ./autogen.sh
- ./configure --prefix=/usr
- make
+ cd "$srcdir"
+ msg "Connecting to Mercurial server...."
+
+ if [[ -d "$_hgrepo" ]]; then
+ cd "$_hgrepo"
+ hg pull -u
+ msg "The local files are updated."
+ else
+ hg clone "$_hgroot" "$_hgrepo"
+ fi
+
+ msg "Mercurial checkout done or server timeout"
+ msg "Starting build..."
+
+ rm -rf "$srcdir/$_hgrepo-build"
+ cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
+ cd "$srcdir/$_hgrepo-build"
+
+ #
+ # BUILD HERE
+ #
+ ./autogen.sh
+ ./configure --prefix=/usr
+ make
}
package() {
- cd "$srcdir/$_hgrepo-build"
- make DESTDIR="$pkgdir/" install
+ cd "$srcdir/$_hgrepo-build"
+ make DESTDIR="$pkgdir/" install
}
diff --git a/prototypes/PKGBUILD-perl.proto b/prototypes/PKGBUILD-perl.proto
index 38c3b7a..f7cfda3 100644
--- a/prototypes/PKGBUILD-perl.proto
+++ b/prototypes/PKGBUILD-perl.proto
@@ -33,21 +33,21 @@ source=("http://cpan.perl.org/modules/by-module/$_modnamespace/$_perlmod-$pkgver
md5sums=()
build() {
- cd "$srcdir/$_perlmod-$pkgver"
+ cd "$srcdir/$_perlmod-$pkgver"
- # Install module in vendor directories.
- PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
- make
+ # Install module in vendor directories.
+ PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+ make
- ## For packages with Build.PL, do this instead:
- # perl Build.PL installdirs=vendor destdir="$pkgdir/"
- # perl Build
+ ## For packages with Build.PL, do this instead:
+ # perl Build.PL installdirs=vendor destdir="$pkgdir/"
+ # perl Build
}
package() {
- cd "$srcdir/$_perlmod-$pkgver"
- make install DESTDIR="$pkgdir/"
+ cd "$srcdir/$_perlmod-$pkgver"
+ make install DESTDIR="$pkgdir/"
- ## For packages with Build.PL, do this instead:
- # perl Build install
+ ## For packages with Build.PL, do this instead:
+ # perl Build install
}
diff --git a/prototypes/PKGBUILD-python.proto b/prototypes/PKGBUILD-python.proto
index 41711a9..12b6eae 100644
--- a/prototypes/PKGBUILD-python.proto
+++ b/prototypes/PKGBUILD-python.proto
@@ -27,6 +27,6 @@ source=()
md5sums=()
package() {
- cd "$srcdir/$pkgname-$pkgver"
- python setup.py install --root="$pkgdir/" --optimize=1
+ cd "$srcdir/$pkgname-$pkgver"
+ python setup.py install --root="$pkgdir/" --optimize=1
}
diff --git a/prototypes/PKGBUILD-rubygem.proto b/prototypes/PKGBUILD-rubygem.proto
index 1aebe57..aafedbd 100644
--- a/prototypes/PKGBUILD-rubygem.proto
+++ b/prototypes/PKGBUILD-rubygem.proto
@@ -22,11 +22,11 @@ noextract=($_gemname-$pkgver.gem)
md5sums=()
package() {
- cd "$srcdir"
- # _gemdir is defined inside package() because if ruby[gems] is not installed on
- # the system, makepkg will exit with an error when sourcing the PKGBUILD.
- local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
+ cd "$srcdir"
+ # _gemdir is defined inside package() because if ruby[gems] is not installed on
+ # the system, makepkg will exit with an error when sourcing the PKGBUILD.
+ local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
- gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \
- "$_gemname-$pkgver.gem"
+ gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \
+ "$_gemname-$pkgver.gem"
}
diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto
index 48c98bb..37e40e1 100644
--- a/prototypes/PKGBUILD-svn.proto
+++ b/prototypes/PKGBUILD-svn.proto
@@ -31,31 +31,31 @@ _svntrunk=SVNURL
_svnmod=MODNAME
build() {
- cd "$srcdir"
- msg "Connecting to SVN server...."
-
- if [[ -d "$_svnmod/.svn" ]]; then
- (cd "$_svnmod" && svn up -r "$pkgver")
- else
- svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod"
- fi
-
- msg "SVN checkout done or server timeout"
- msg "Starting build..."
-
- rm -rf "$srcdir/$_svnmod-build"
- svn export "$srcdir/$_svnmod" "$srcdir/$_svnmod-build"
- cd "$srcdir/$_svnmod-build"
-
- #
- # BUILD HERE
- #
- ./autogen.sh
- ./configure --prefix=/usr
- make
+ cd "$srcdir"
+ msg "Connecting to SVN server...."
+
+ if [[ -d "$_svnmod/.svn" ]]; then
+ (cd "$_svnmod" && svn up -r "$pkgver")
+ else
+ svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod"
+ fi
+
+ msg "SVN checkout done or server timeout"
+ msg "Starting build..."
+
+ rm -rf "$srcdir/$_svnmod-build"
+ svn export "$srcdir/$_svnmod" "$srcdir/$_svnmod-build"
+ cd "$srcdir/$_svnmod-build"
+
+ #
+ # BUILD HERE
+ #
+ ./autogen.sh
+ ./configure --prefix=/usr
+ make
}
package() {
- cd "$srcdir/$_svnmod-build"
- make DESTDIR="$pkgdir/" install
+ cd "$srcdir/$_svnmod-build"
+ make DESTDIR="$pkgdir/" install
}
diff --git a/prototypes/proto-gnome.install b/prototypes/proto-gnome.install
index 9d3c7e9..521cf4d 100644
--- a/prototypes/proto-gnome.install
+++ b/prototypes/proto-gnome.install
@@ -1,22 +1,22 @@
pkgname=NAME
post_install() {
- usr/sbin/gconfpkg --install "$pkgname"
- update-desktop-database -q
+ usr/sbin/gconfpkg --install "$pkgname"
+ update-desktop-database -q
}
pre_upgrade() {
- pre_remove "$1"
+ pre_remove "$1"
}
post_upgrade() {
- post_install "$1"
+ post_install "$1"
}
pre_remove() {
- usr/sbin/gconfpkg --uninstall "$pkgname"
+ usr/sbin/gconfpkg --uninstall "$pkgname"
}
post_remove() {
- update-desktop-database -q
+ update-desktop-database -q
}
diff --git a/prototypes/proto-haskell.install b/prototypes/proto-haskell.install
index 962d0e1..9b96a60 100644
--- a/prototypes/proto-haskell.install
+++ b/prototypes/proto-haskell.install
@@ -2,17 +2,17 @@ pkgname=NAME
HS_DIR="usr/share/haskell/haskell-$pkgname"
post_install() {
- "$HS_DIR/register.sh"
+ "$HS_DIR/register.sh"
}
pre_upgrade() {
- "$HS_DIR/unregister.sh"
+ "$HS_DIR/unregister.sh"
}
post_upgrade() {
- "$HS_DIR/register.sh"
+ "$HS_DIR/register.sh"
}
pre_remove() {
- "$HS_DIR/unregister.sh"
+ "$HS_DIR/unregister.sh"
}
diff --git a/prototypes/proto-info.install b/prototypes/proto-info.install
index 73131bc..6950003 100644
--- a/prototypes/proto-info.install
+++ b/prototypes/proto-info.install
@@ -2,19 +2,19 @@ infodir=usr/share/info
filelist=(foo.info bar)
post_install() {
- [[ -x usr/bin/install-info ]] || return 0
- for file in "${filelist[@]}"; do
- install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
- done
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
}
post_upgrade() {
- post_install "$1"
+ post_install "$1"
}
pre_remove() {
- [[ -x usr/bin/install-info ]] || return 0
- for file in "${filelist[@]}"; do
- install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
- done
+ [[ -x usr/bin/install-info ]] || return 0
+ for file in "${filelist[@]}"; do
+ install-info --delete "$infodir/$file.gz" "$infodir/dir" 2> /dev/null
+ done
}
--
1.8.0
More information about the arch-projects
mailing list