- Pacman-dev - lists.archlinux.org

[pacman-dev] [PATCHv3] makepkg.conf(5): Add missing backticks around vars, and use single quotes around "gpg" command
by Jason St. John 02 Feb '14

02 Feb '14

Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- I'm leaving the "C++" bit untouched in this patch. doc/makepkg.conf.5.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index ef64d17..af8aa30 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -78,7 +78,7 @@ Options Other flags that make accepts can also be passed. **DEBUG_CFLAGS=**"debug_cflags":: - Additional compiler flags appended to CFLAGS for use in debugging. Usually + Additional compiler flags appended to `CFLAGS` for use in debugging. Usually this would include: ``-g''. Read gcc(1) for more details on the wide variety of compiler flags available. @@ -115,8 +115,8 @@ Options makepkg's '\--check' and '\--nocheck' options respectively. *sign*;; - Generate a PGP signature file using GnuPG. This will execute `gpg - --detach-sign --use-agent` on the built package to generate a detached + Generate a PGP signature file using GnuPG. This will execute 'gpg + \--detach-sign \--use-agent' on the built package to generate a detached signature file, using the GPG agent if it is available. The signature file will be the entire filename of the package with a ``.sig'' extension. @@ -202,20 +202,20 @@ Options for details. **MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**:: - If `zipman` is specified in the OPTIONS array, this variable will + If `zipman` is specified in the `OPTIONS` array, this variable will instruct makepkg where to look to compress manual (man and info) pages. If you build packages that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. **DOC_DIRS=(**usr/{,share/}{doc,gtk-doc} ...**)**:: - If `!docs` is specified in the OPTIONS array, this variable will + If `!docs` is specified in the `OPTIONS` array, this variable will instruct makepkg where to look to remove docs. If you build packages that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. **PURGE_TARGETS=(**usr/{,share}/info/dir .podlist *.pod...**)**:: - If `purge` is specified in the OPTIONS array, this variable will + If `purge` is specified in the `OPTIONS` array, this variable will instruct makepkg which files to remove from the package. This is useful for index files that are added by multiple packages. -- 1.8.5.3

1 0

[pacman-dev] [PATCHv2 1/2] makepkg.conf(5): Add missing backticks around vars, and use single quotes around "gpg" command
by Jason St. John 02 Feb '14

02 Feb '14

Escape the first '+' character in "C++" to fix Vim syntax highlighting. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- This is a resubmission based on Dan's feedback here: https://mailman.archlinux.org/pipermail/pacman-dev/2014-January/018605.html doc/makepkg.conf.5.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index ef64d17..0f3eb88 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -78,7 +78,7 @@ Options Other flags that make accepts can also be passed. **DEBUG_CFLAGS=**"debug_cflags":: - Additional compiler flags appended to CFLAGS for use in debugging. Usually + Additional compiler flags appended to `CFLAGS` for use in debugging. Usually this would include: ``-g''. Read gcc(1) for more details on the wide variety of compiler flags available. @@ -96,7 +96,7 @@ Options Allow building packages as a non-root user. This is highly recommended. *distcc*;; - Use the distributed C/C++/ObjC compiler to spread compilation among + Use the distributed C/C\++/ObjC compiler to spread compilation among multiple machines. If this is enabled, `DISTCC_HOSTS` must be specified as well. @@ -115,8 +115,8 @@ Options makepkg's '\--check' and '\--nocheck' options respectively. *sign*;; - Generate a PGP signature file using GnuPG. This will execute `gpg - --detach-sign --use-agent` on the built package to generate a detached + Generate a PGP signature file using GnuPG. This will execute 'gpg + \--detach-sign \--use-agent' on the built package to generate a detached signature file, using the GPG agent if it is available. The signature file will be the entire filename of the package with a ``.sig'' extension. @@ -202,20 +202,20 @@ Options for details. **MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**:: - If `zipman` is specified in the OPTIONS array, this variable will + If `zipman` is specified in the `OPTIONS` array, this variable will instruct makepkg where to look to compress manual (man and info) pages. If you build packages that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. **DOC_DIRS=(**usr/{,share/}{doc,gtk-doc} ...**)**:: - If `!docs` is specified in the OPTIONS array, this variable will + If `!docs` is specified in the `OPTIONS` array, this variable will instruct makepkg where to look to remove docs. If you build packages that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. **PURGE_TARGETS=(**usr/{,share}/info/dir .podlist *.pod...**)**:: - If `purge` is specified in the OPTIONS array, this variable will + If `purge` is specified in the `OPTIONS` array, this variable will instruct makepkg which files to remove from the package. This is useful for index files that are added by multiple packages. -- 1.8.5.3

2 3

[pacman-dev] [PATCHv2 1/2] proto: Remove recommendation of "makepkg -g" in comments
by Jason St. John 02 Feb '14

02 Feb '14

This recommendation encouraged the practice of not checking the checksums provided upstream. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- This is a resubmission based on Allan's feedback here: https://mailman.archlinux.org/pipermail/pacman-dev/2014-January/018570.html proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index d0978d7..dd73f93 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -28,7 +28,7 @@ changelog= source=("$pkgbase-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() -md5sums=() #generate with 'makepkg -g' +md5sums=() prepare() { cd "$pkgname-$pkgver" diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 8d26c81..12816e0 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -27,7 +27,7 @@ changelog= source=("$pkgname-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() -md5sums=() #generate with 'makepkg -g' +md5sums=() prepare() { cd "$pkgname-$pkgver" -- 1.8.5.3

2 2

[pacman-dev] [PATCH 1/3] makepkg.conf(5): Add missing backticks around vars, and use single quotes around "gpg" command
by Jason St. John 01 Feb '14

01 Feb '14

Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- I left some of the references to CFLAGS, etc. without backticks because they are references to sections within the man page rather than about the literal variables themselves. I added backticks around "C/C++/ObjC" to prevent any possible confusion by AsciiDoc, as plus signs are parsed as AsciiDoc quotes. This apparently confused Vim's syntax highlighting, which is why I noticed it. doc/makepkg.conf.5.txt | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index ef64d17..e43368c 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -78,7 +78,7 @@ Options Other flags that make accepts can also be passed. **DEBUG_CFLAGS=**"debug_cflags":: - Additional compiler flags appended to CFLAGS for use in debugging. Usually + Additional compiler flags appended to `CFLAGS` for use in debugging. Usually this would include: ``-g''. Read gcc(1) for more details on the wide variety of compiler flags available. @@ -96,7 +96,7 @@ Options Allow building packages as a non-root user. This is highly recommended. *distcc*;; - Use the distributed C/C++/ObjC compiler to spread compilation among + Use the distributed `C/C++/ObjC` compiler to spread compilation among multiple machines. If this is enabled, `DISTCC_HOSTS` must be specified as well. @@ -115,8 +115,8 @@ Options makepkg's '\--check' and '\--nocheck' options respectively. *sign*;; - Generate a PGP signature file using GnuPG. This will execute `gpg - --detach-sign --use-agent` on the built package to generate a detached + Generate a PGP signature file using GnuPG. This will execute 'gpg + \--detach-sign \--use-agent' on the built package to generate a detached signature file, using the GPG agent if it is available. The signature file will be the entire filename of the package with a ``.sig'' extension. @@ -202,20 +202,20 @@ Options for details. **MAN_DIRS=(**{usr{,/local}{,/share},opt/*}/{man,info} ...**)**:: - If `zipman` is specified in the OPTIONS array, this variable will + If `zipman` is specified in the `OPTIONS` array, this variable will instruct makepkg where to look to compress manual (man and info) pages. If you build packages that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. **DOC_DIRS=(**usr/{,share/}{doc,gtk-doc} ...**)**:: - If `!docs` is specified in the OPTIONS array, this variable will + If `!docs` is specified in the `OPTIONS` array, this variable will instruct makepkg where to look to remove docs. If you build packages that are located in opt/, you may need to add the directory to this array. *NOTE:* Do not add the leading slash to the directory name. **PURGE_TARGETS=(**usr/{,share}/info/dir .podlist *.pod...**)**:: - If `purge` is specified in the OPTIONS array, this variable will + If `purge` is specified in the `OPTIONS` array, this variable will instruct makepkg which files to remove from the package. This is useful for index files that are added by multiple packages. -- 1.8.5.3

4 7

[pacman-dev] [PATCH] Add PKGBUILD-vcs.proto
by Maxime Gauduin 30 Jan '14

30 Jan '14

Add a proto for bzr, git, hg and svn PKGBUILDs and remove the corresponding protos from abs. Signed-off-by: Maxime Gauduin <alucryd(a)gmail.com> --- proto/PKGBUILD-vcs.proto | 95 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) create mode 100644 proto/PKGBUILD-vcs.proto diff --git a/proto/PKGBUILD-vcs.proto b/proto/PKGBUILD-vcs.proto new file mode 100644 index 0000000..3aa7890 --- /dev/null +++ b/proto/PKGBUILD-vcs.proto @@ -0,0 +1,95 @@ +# This is an example PKGBUILD file. Use this as a start to creating your own, +# and remove these comments. For more information, see 'man PKGBUILD'. +# NOTE: Please fill out the license field for your package! If it is unknown, +# then please put 'unknown'. + +# The following guidelines are specific to BZR, GIT, HG and SVN packages. +# CVS and DARCS are not natively supported in pacman yet, please refer to the +# dedicated prototypes instead. + +# Maintainer: Your Name <youremail(a)domain.com> +pkgname=NAME-VCS # '-bzr', '-git', '-hg' or '-svn' +pkgver=VERSION +pkgrel=1 +pkgdesc="" +arch=() +url="" +license=('GPL') +groups=() +depends=() +makedepends=('VCS_PACKAGE') # 'bzr', 'git', 'mercurial' or 'subversion' +provides=("${pkgname%-VCS}") +conflicts=("${pkgname%-VCS}") +replaces=() +backup=() +options=() +install= +source=('DIR_NAME::VCS+REPO_URL#FRAGMENT') +noextract=() +md5sums=('SKIP') + +################################################################################ + +# DIR_NAME: Use to change the source directory name if needed + +# VCS: Use to specify the VCS type, not needed when REPO_URL is explicit (for +# example git://URL, svn://URL or lp:REPO_NAME) + +# FRAGMENT: Use to pull a specific branch, commit/revision or tag +# Bazaar accepts the 'revision' keyword +# Git accepts the 'branch', 'commit' and 'tag' keywords +# Mercurial accepts the 'branch', 'revision' and 'tag' keywords +# Subversion accepts the 'revision' keyword + +# Examples: +# source=("lp:${pkgname%-bzr}#revision=42") +# source=("git+https://github.com/author/${pkgname%-git}.git#branch=unstable") +# source=('hg+https://bitbucket.org/author/project#tag=2.0') +# source=("${pkgname%-svn}::svn://svn.code.sf.net/p/project/code/trunk"} + +################################################################################ + +pkgver() { + cd "$srcdir/${pkgname%-VCS}" + +# The examples below are not absolute and need to be adapted to each repo. The +# general idea is to have VERSION='VER_NUM.rREV_NUM.HASH' or any subset in case +# VER_NUM or HASH are not available. + +# Bazaar + printf "r%s" "$(bzr revno)" + +# Git, tags available + printf "%s" "$(git describe --long | sed 's/$[^-]*-$g/r\1/;s/-/./g')" + +# Git, no tags available + printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)" + +# Mercurial + printf "r%s.%s" "$(hg identify -n)" "$(hg identify -i)" + +# Subversion + printf "r%s" "$(svnversion | tr -d 'A-z')" +} + +prepare() { + cd "$srcdir/${pkgname%-VCS}" + patch -p1 -i "$srcdir/${pkgname%-VCS}.patch" +} + +build() { + cd "$srcdir/${pkgname%-VCS}" + ./autogen.sh + ./configure --prefix=/usr + make +} + +check() { + cd "$srcdir/${pkgname%-VCS}" + make -k check +} + +package() { + cd "$srcdir/${pkgname%-VCS}" + make DESTDIR="$pkgdir/" install +} -- 1.8.5.3

2 7

[pacman-dev] [PATCH 1/4] Recommend using "updpkgsums" in PKGBUILD prototypes instead of "makepkg -g"
by Jason St. John 30 Jan '14

30 Jan '14

Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- proto/PKGBUILD-split.proto | 2 +- proto/PKGBUILD.proto | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/proto/PKGBUILD-split.proto b/proto/PKGBUILD-split.proto index f341052..b2832b9 100644 --- a/proto/PKGBUILD-split.proto +++ b/proto/PKGBUILD-split.proto @@ -27,7 +27,7 @@ changelog= source=("$pkgbase-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() -md5sums=() #generate with 'makepkg -g' +md5sums=() # generate with 'updpkgsums' prepare() { cd "$pkgname-$pkgver" diff --git a/proto/PKGBUILD.proto b/proto/PKGBUILD.proto index 8d26c81..479d5e5 100644 --- a/proto/PKGBUILD.proto +++ b/proto/PKGBUILD.proto @@ -27,7 +27,7 @@ changelog= source=("$pkgname-$pkgver.tar.gz" "$pkgname-$pkgver.patch") noextract=() -md5sums=() #generate with 'makepkg -g' +md5sums=() # generate with 'updpkgsums' prepare() { cd "$pkgname-$pkgver" -- 1.8.5.3

6 12

[pacman-dev] [PATCH 0/4] Smatch warning fixes
by Silvan Jegen 30 Jan '14

30 Jan '14

Hi I ran smatch[1] on the pacman source code and it reported a few minor issues. Three out of four of the following patches are checks for NULL when freeing memory which are strictly not necessary since calling free with a NULL argument is a no-op. The last patch moves a NULL check before a pointer dereference which should be the correct place to put it. Cheers, Silvan [1] http://smatch.sourceforge.net/ Silvan Jegen (4): Remove unneeded NULL check Another unneeded NULL check removed Another NULL check removed Move NULL check before dereference src/pacman/pacman.c | 16 +++++++--------- src/pacman/util.c | 10 ++++------ src/util/pacsort.c | 5 +---- 3 files changed, 12 insertions(+), 19 deletions(-) -- 1.8.5.3

4 10

[pacman-dev] [PATCH 1/6] pacman.c: remove unnecessary optarg checks
by Andrew Gregory 30 Jan '14

30 Jan '14

getopt takes care of making sure that options that require a value have one. These checks were only added to silence clang, which no longer complains about optarg being unchecked, and newer options already use optarg unchecked. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- I haven't been able to find a warning flag that makes clang complain anyway. src/pacman/pacman.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c index 6bf94e9..1fb447c 100644 --- a/src/pacman/pacman.c +++ b/src/pacman/pacman.c @@ -321,8 +321,6 @@ static void handler(int signum) cleanup(128 + signum); } -#define check_optarg() if(!optarg) { return 1; } - static void invalid_opt(int used, const char *opt1, const char *opt2) { if(used) { @@ -337,7 +335,6 @@ static int parsearg_util_addlist(alpm_list_t **list) { char *i, *save; - check_optarg(); for(i = strtok_r(optarg, ",", &save); i; i = strtok_r(NULL, ",", &save)) { *list = alpm_list_add(*list, strdup(i)); @@ -393,16 +390,13 @@ static int parsearg_global(int opt) { switch(opt) { case OP_ARCH: - check_optarg(); config_set_arch(optarg); break; case OP_ASK: - check_optarg(); config->noask = 1; config->ask = (unsigned int)atoi(optarg); break; case OP_CACHEDIR: - check_optarg(); config->cachedirs = alpm_list_add(config->cachedirs, strdup(optarg)); break; case OP_COLOR: @@ -420,7 +414,6 @@ static int parsearg_global(int opt) enable_colors(config->color); break; case OP_CONFIG: - check_optarg(); if(config->configfile) { free(config->configfile); } @@ -453,7 +446,6 @@ static int parsearg_global(int opt) config->gpgdir = strdup(optarg); break; case OP_LOGFILE: - check_optarg(); config->logfile = strndup(optarg, PATH_MAX); break; case OP_NOCONFIRM: @@ -461,12 +453,10 @@ static int parsearg_global(int opt) break; case OP_DBPATH: case 'b': - check_optarg(); config->dbpath = strdup(optarg); break; case OP_ROOT: case 'r': - check_optarg(); config->rootdir = strdup(optarg); break; case OP_VERBOSE: @@ -632,7 +622,6 @@ static int parsearg_trans(int opt) config->print = 1; break; case OP_PRINTFORMAT: - check_optarg(); config->print = 1; config->print_format = strdup(optarg); break; -- 1.8.5.2

6 15

[pacman-dev] [PATCH] Consistently use 'directory' instead of 'folder'
by Allan McRae 28 Jan '14

28 Jan '14

Signed-off-by: Allan McRae <allan(a)archlinux.org> --- NEWS | 2 +- doc/PKGBUILD.5.txt | 8 ++++---- doc/makepkg.8.txt | 24 ++++++++++++------------ doc/makepkg.conf.5.txt | 12 ++++++------ scripts/library/README | 2 +- 5 files changed, 24 insertions(+), 24 deletions(-) diff --git a/NEWS b/NEWS index 296e196..02148d3 100644 --- a/NEWS +++ b/NEWS @@ -655,7 +655,7 @@ VERSION DESCRIPTION - fix overzealous use of macros - entire codebase builds with -pedantic GCC option - libalpm-specific changes: - - moved location of sync DBs into their own folder to thwart + - moved location of sync DBs into their own directory to thwart deletion and remove naming limitations - REQUIREDBY entries are no longer used in local DB but are computed on the fly when needed, which should resolve diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 6c5ef84..eeb5696 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -422,16 +422,16 @@ Using VCS Sources[[VCS]] ------------------------ Building a developmental version of a package using sources from a version control system (VCS) is enabled by specifying the source in the form -`source=('folder::url#fragment')`. Currently makepkg supports the Bazaar, Git, +`source=('directory::url#fragment')`. Currently makepkg supports the Bazaar, Git, Subversion, and Mercurial version control systems. For other version control systems, manual cloning of upstream repositories must be done in the `prepare()` function. The source URL is divided into three components: -*folder*:: - (optional) Specifies an alternate folder name for makepkg to download the VCS - source into. +*directory*:: + (optional) Specifies an alternate directory name for makepkg to download + the VCS source into. *url*:: The URL to the VCS repository. This must include the VCS in the URL protocol diff --git a/doc/makepkg.8.txt b/doc/makepkg.8.txt index 6abb7fb..29f4a03 100644 --- a/doc/makepkg.8.txt +++ b/doc/makepkg.8.txt @@ -220,28 +220,28 @@ Environment Variables Use an alternate config file instead of the +{sysconfdir}/makepkg.conf+ default. -**PKGDEST=**"/path/to/folder":: - Folder where the resulting packages will be stored. Overrides the +**PKGDEST=**"/path/to/directory":: + Directory where the resulting packages will be stored. Overrides the corresponding value defined in linkman:makepkg.conf[5]. -**SRCDEST=**"/path/to/folder":: - Folder where the downloaded sources will be stored. Overrides the +**SRCDEST=**"/path/to/directory":: + Directory where the downloaded sources will be stored. Overrides the corresponding value defined in linkman:makepkg.conf[5]. -**SRCPKGDEST=**"/path/to/folder":: - Folder where source package files will be stored. Overrides the +**SRCPKGDEST=**"/path/to/directory":: + Directory where source package files will be stored. Overrides the corresponding value defined in linkman:makepkg.conf[5]. -**LOGDEST=**"/path/to/folder":: - Folder where generated log files will be stored. Overrides the +**LOGDEST=**"/path/to/directory":: + Directory where generated log files will be stored. Overrides the corresponding value defined in linkman:makepkg.conf[5]. **PACKAGER=**"John Doe <john(a)doe.com>":: String to identify the creator of the resulting package. Overrides the corresponding value defined in linkman:makepkg.conf[5]. -**BUILDDIR=**"/path/to/folder":: - Folder where the package will be built. Overrides the corresponding +**BUILDDIR=**"/path/to/directory":: + Directory where the package will be built. Overrides the corresponding value defined in linkman:makepkg.conf[5]. **CARCH=**"(i686|x86_64)":: @@ -252,8 +252,8 @@ Environment Variables Sets the compression used when making compiled or source packages. Overrides the corresponding value defined in linkman:makepkg.conf[5]. -**GNUPGHOME=**"/path/to/folder":: - Folder where the gpg keyring for signing the built package is stored. +**GNUPGHOME=**"/path/to/directory":: + Directory where the gpg keyring for signing the built package is stored. **GPGKEY=**"keyid":: Specify a key to use when signing packages, overriding the GPGKEY setting diff --git a/doc/makepkg.conf.5.txt b/doc/makepkg.conf.5.txt index ef64d17..e85a8e9 100644 --- a/doc/makepkg.conf.5.txt +++ b/doc/makepkg.conf.5.txt @@ -126,10 +126,10 @@ Options running in the DistCC cluster. In addition, you will want to modify your `MAKEFLAGS`. -**BUILDDIR=**"/path/to/folder":: +**BUILDDIR=**"/path/to/directory":: If this value is not set, packages will by default be built in subdirectories of the directory that makepkg is called from. This - option allows setting the build location to another folder. + option allows setting the build location to another directory. Incorrect use of `$startdir` in a PKGBUILD may cause building with this option to fail. @@ -219,23 +219,23 @@ Options instruct makepkg which files to remove from the package. This is useful for index files that are added by multiple packages. -**PKGDEST=**"/path/to/folder":: +**PKGDEST=**"/path/to/directory":: If this value is not set, packages will by default be placed in the current directory (location of the linkman:PKGBUILD[5]). Many people like to keep all their packages in one place so this option allows this behavior. A common location is ``/home/packages''. -**SRCDEST=**"/path/to/folder":: +**SRCDEST=**"/path/to/directory":: If this value is not set, downloaded source files will only be stored in the current directory. Many people like to keep all source files in a central location for easy cleanup, so this path can be set here. -**SRCPKGDEST=**"/path/to/folder":: +**SRCPKGDEST=**"/path/to/directory":: If this value is not set, source package files will be stored in in the current directory. Many people like to keep all source package files in a central location for easy cleanup, so this path can be set here. -**LOGDEST=**"/path/to/folder":: +**LOGDEST=**"/path/to/directory":: If this value is not set, log files are written to the current directory. This centralizes the log location, facilitating cleanup and compression. diff --git a/scripts/library/README b/scripts/library/README index 9e2b6a1..e9615a2 100644 --- a/scripts/library/README +++ b/scripts/library/README @@ -1,4 +1,4 @@ -This folder contains code snippets that can be reused by multiple +This directory contains code snippets that can be reused by multiple scripts. A brief description of each file follows. output_format.sh: -- 1.8.5.3

1 0

[pacman-dev] [PATCH] enable_colors: always set color strings
by Andrew Gregory 28 Jan '14

28 Jan '14

Only setting color strings when colors is true allowed subsequent calls to enable colors but not disable them. Signed-off-by: Andrew Gregory <andrew.gregory.8(a)gmail.com> --- src/pacman/conf.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/pacman/conf.c b/src/pacman/conf.c index 5450f3b..4d71ada 100644 --- a/src/pacman/conf.c +++ b/src/pacman/conf.c @@ -76,6 +76,16 @@ void enable_colors(int colors) colstr->warn = BOLDYELLOW; colstr->err = BOLDRED; colstr->nocolor = NOCOLOR; + } else { + colstr->colon = ":: "; + colstr->title = ""; + colstr->repo = ""; + colstr->version = ""; + colstr->groups = ""; + colstr->meta = ""; + colstr->warn = ""; + colstr->err = ""; + colstr->nocolor = ""; } } -- 1.8.5.3

2 1