Skip to content
Browse files

Merge pull request #41 from GunioRobot/clean

Whitespace cleanup
  • Loading branch information...
2 parents 807cda4 + 4ce142f commit 49190646d4284430d183bb04ac517cb3eefe90f7 @Daenyth Daenyth committed Dec 19, 2011
Showing with 26 additions and 26 deletions.
  1. +4 −4 doc/spec2arch.1
  2. +11 −11 doc/spec2arch.conf.5
  3. +2 −2 modules/README
  4. +2 −2 other/functions
  5. +1 −1 other/pkgfile-hook.sh
  6. +3 −3 scripts/newpkg
  7. +3 −3 scripts/whoneeds.bash
View
8 doc/spec2arch.1
@@ -105,12 +105,12 @@ script itself, where you may configure the URL path for the source tarball.
.SH "FILES"
/usr/bin/spec2arch
-.SH "SEE ALSO"
-.PP
+.SH "SEE ALSO"
+.PP
spec2arch.conf(5)
-.SH "AUTHOR"
-.PP
+.SH "AUTHOR"
+.PP
This manual page was written by Andreas Itzchak Rehberg (devel@izzysoft.de),
the author of the program. Credit should be given also to Daenyth <Daenyth+Arch
AT gmail DOT com> who added a lot concerning the ArchLinux specials - so if you
View
22 doc/spec2arch.conf.5
@@ -1,20 +1,20 @@
.TH "SPEC2ARCH.CONF" "5" "01 July 2008"
-.SH "NAME"
+.SH "NAME"
spec2arch.conf.conf \- Configuration file for \fBspec2arch\fR, which creates
ArchLinux PKGBUILD files from RPM spec files
-.SH "DESCRIPTION"
-.PP
+.SH "DESCRIPTION"
+.PP
This manual page documents the options that can be set in the spec2arch.conf
configuration file. For a description of what spec2arch does, see the
spec2arch(8) manpage.
-.SH "SETTINGS"
-.PP
+.SH "SETTINGS"
+.PP
The syntax of options is OPTION=value - Bash syntax, since it will be sourced
by the pkgmake executable, which is written in Bash script.
.PP
-The following settings are available in spec2arch.conf:
+The following settings are available in spec2arch.conf:
.IP "\fBSRC_BASEURL\fP" 10
Here you can define a base URL where the source is available for download.
@@ -68,16 +68,16 @@ If namcap.py is found in the $PATH, shall it be used to verify the generated
PKGBUILD file (1 - default) or not (0)? It is recommended to use this tool
to detect possible problems.
-.SH "SEE ALSO"
-.PP
+.SH "SEE ALSO"
+.PP
spec2arch(8)
-.SH "AUTHOR"
-.PP
+.SH "AUTHOR"
+.PP
This manual page was written by Andreas Itzchak Rehberg (devel@izzysoft.de),
the author of the program. Permission is granted to copy, distribute and/or
modify this document under the terms of the GNU General Public License,
Version 2.
More information may be found on the authors website, http://www.izzysoft.de/
-
+
View
4 modules/README
@@ -11,11 +11,11 @@ Here is an usage example:
>>> import pkgfile
>>> search = pkgfile.Search(pkgfile.MATCH_SIMPLE, pkgfile.SEARCH_FILENAME, 'pacman')
>>> # this gives us an object 'search' that is callable
- ...
+ ...
>>> matches = search('core.files.tar.gz')
>>> print matches
[{'files': ['etc/bash_completion.d/pacman', 'usr/bin/pacman'], 'version': '3.4.1-1', 'name': 'pacman'}]
-
+
One can also use:
- MATCH_REGEX to match for a regex,
- MATCH_PCRE for a pcre style regex,
View
4 other/functions
@@ -1,7 +1,7 @@
#!/bin/bash
die () {
- local ret=$1;
+ local ret=$1;
local warning="$2"; shift 2
warn "${warning:-Unknown error}" "$@"
quit ${ret:-1}
@@ -31,7 +31,7 @@ in_array() {
needle=$1
shift
for item
- do
+ do
[ "$item" = "$needle" ] && return 0
done
return 1
View
2 other/pkgfile-hook.sh
@@ -1,7 +1,7 @@
CMD_SEARCH_ENABLED=0
[ -f /etc/pkgtools/pkgfile.conf ] && CMD_SEARCH_ENABLED=`. /etc/pkgtools/pkgfile.conf; echo $CMD_SEARCH_ENABLED`
[ -f "$HOME/.config/pkgtools/pkgfile.conf" ] && CMD_SEARCH_ENABLED=`. "$HOME/.config/pkgtools/pkgfile.conf"; echo $CMD_SEARCH_ENABLED`
-
+
# Load shell-specific pkgfile hook
# Determine our shell without using $SHELL, which may lie
# (trick adapted from /etc/profile)
View
6 scripts/newpkg
@@ -5,17 +5,17 @@
# This program is a part of pkgtools
# Copyright (C) 2008-2011 Daenyth <Daenyth+Arch _AT_ gmail _DOT_ com>
-#
+#
# Pkgtools is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
-#
+#
# Pkgtools is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
View
6 scripts/whoneeds.bash
@@ -9,17 +9,17 @@ query=$1
function walk_nodes () {
local package=$1
-
+
# if we've walked this node before, skip. This drastically
# reduces overhead for a relatively cheap operation
[[ ${walked_nodes[$package]} -eq 1 ]] && return 0
walked_nodes[$package]=1
-
+
# we do this so that we can make a single call to pacman
# to get both bits of information that we require
result=( $(LC_ALL=c pacman -Qi $package | awk -F':' \
'BEGIN { tag = ""; dependents = ""; explicit = 0 }
- {
+ {
# since the formatting of the pacman output is more for human
# consumption than programmatic, we find ourselves with the following need.
# if we have two fields, then we know we have a proper identifier on the line

0 comments on commit 4919064

Please sign in to comment.
Something went wrong with that request. Please try again.