November 2011 - Arch-projects - lists.archlinux.org

[arch-projects] [ABS] [PATCH v2 6/7] git prototype: on initial clones, perform a shallow clone
by Linus Arver 03 Nov '11

03 Nov '11

Definition: shallow git clones are just like regular clones, but do not contain any of the past commit history. It is virtually the same thing as doing a regular clone, then doing a rebase to squash all commits into a single commit. Many people who do not understand git dismiss shallow clones because they wrongly believe that shallow clones are incapable of pulling in changes going forward from the remote. This is not the case! You can still do pulls from the master remote repo in the future to update the shallow clone, just like a regular clone! Now, when doing an inital clone, we should *always* encourage PKGBUILD authors to do a shallow clone. This will save time (less downloading) and disk space (e.g., yaourt users). The savings can be hundreds of MiB for large git repos. Advanced PKGBUILD authors who need to pull in an older version of the remote repo will already have the knowledge to remove the "--depth 1" to suit their needs. This change will also help AUR packagers out there who do not understand git at all to make this change themselves. Signed-off-by: Linus Arver <linusarver(a)gmail.com> --- prototypes/PKGBUILD-git.proto | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto index 54c93dc..be6ebbb 100644 --- a/prototypes/PKGBUILD-git.proto +++ b/prototypes/PKGBUILD-git.proto @@ -39,7 +39,7 @@ build() { msg "The local files are updated." cd .. else - git clone "$_gitroot" "$_gitname" + git clone --depth 1 "$_gitroot" "$_gitname" fi msg "GIT checkout done or server timeout" -- 1.7.7.2

1 0

[arch-projects] [ABS] [PATCH v2 5/7] vcs prototypes: more efficient temp build directories
by Linus Arver 03 Nov '11

03 Nov '11

The bzr, darcs, git, and hg version control systems use a single internal folder at the root to store all VCS-related data (commits, history, etc.). This folder can get quite large (hundreds of MiB) for big projects and continues to grow as the project lives on. We exclude this folder when creating a temporary build directory to save time and space. Since commit 0e79802c0ac8453376d8c0f99629f5a3b499f571 in pacman includes "shopt -s extglob" in pacman/scripts/makepkg.sh.in, we can use the simple "!(foo)" syntax. CVS and SVN pollute the source repo with "CVS" and ".svn" directories recursively for every single directory, so there is no simple one-liner solution to exclude the VCS data for these systems that I am aware of. Signed-off-by: Linus Arver <linusarver(a)gmail.com> --- prototypes/PKGBUILD-bzr.proto | 3 ++- prototypes/PKGBUILD-darcs.proto | 3 ++- prototypes/PKGBUILD-git.proto | 3 ++- prototypes/PKGBUILD-hg.proto | 3 ++- 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto index 6f36205..cbfda0c 100644 --- a/prototypes/PKGBUILD-bzr.proto +++ b/prototypes/PKGBUILD-bzr.proto @@ -46,7 +46,8 @@ build() { msg "Starting build..." rm -rf "$_bzrmod-build" - cp -r "$_bzrmod" "$_bzrmod-build" + mkdir "$_bzrmod-build" + cp -a "$_bzrmod"/!(.bzr) "$_bzrmod-build" cd "$_bzrmod-build" # diff --git a/prototypes/PKGBUILD-darcs.proto b/prototypes/PKGBUILD-darcs.proto index 7fbc1cb..5c261ab 100644 --- a/prototypes/PKGBUILD-darcs.proto +++ b/prototypes/PKGBUILD-darcs.proto @@ -44,7 +44,8 @@ build() { fi rm -rf "$_darcsmod-build" - cp -r "$_darcsmod" "$_darcsmod-build" + mkdir "$_darcsmod-build" + cp -a "$_darcsmod"/!(_darcs) "$_darcsmod-build" cd "$_darcsmod-build" msg "Starting build..." diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto index 08ed0f2..54c93dc 100644 --- a/prototypes/PKGBUILD-git.proto +++ b/prototypes/PKGBUILD-git.proto @@ -46,7 +46,8 @@ build() { msg "Starting build..." rm -rf "$_gitname-build" - git clone "$_gitname" "$_gitname-build" + mkdir "$_gitname-build" + cp -a "$_gitname"/!(.git) "$_gitname-build" cd "$_gitname-build" # diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto index 10b2cd1..bf83286 100644 --- a/prototypes/PKGBUILD-hg.proto +++ b/prototypes/PKGBUILD-hg.proto @@ -46,7 +46,8 @@ build() { msg "Starting build..." rm -rf "$_hgrepo-build" - cp -r "$_hgrepo" "$_hgrepo-build" + mkdir "$_hgrepo-build" + cp -a "$_hgrepo"/!(.hg) "$_hgrepo-build" cd "$_hgrepo-build" # -- 1.7.7.2

1 0

[arch-projects] [ABS] [PATCH v2 4/7] vcs prototypes: consistent coding style
by Linus Arver 03 Nov '11

03 Nov '11

Some vcs prototypes do cd repo && update while others do it like cd repo update to update an existing repo. It makes sense to have them all do it the first way (there's nothing wrong with it, and it has better form). Signed-off-by: Linus Arver <linusarver(a)gmail.com> --- prototypes/PKGBUILD-cvs.proto | 3 +-- prototypes/PKGBUILD-darcs.proto | 3 +-- prototypes/PKGBUILD-hg.proto | 3 +-- prototypes/PKGBUILD-svn.proto | 2 +- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/prototypes/PKGBUILD-cvs.proto b/prototypes/PKGBUILD-cvs.proto index ea12d69..ea29f43 100644 --- a/prototypes/PKGBUILD-cvs.proto +++ b/prototypes/PKGBUILD-cvs.proto @@ -35,8 +35,7 @@ build() { msg "Connecting to $_cvsmod.sourceforge.net CVS server...." if [[ -d "$_cvsmod/CVS" ]]; then - cd "$_cvsmod" - cvs -z3 update -d + cd "$_cvsmod" && cvs -z3 update -d cd .. else cvs -z3 -d "$_cvsroot" co -D "$pkgver" -f "$_cvsmod" diff --git a/prototypes/PKGBUILD-darcs.proto b/prototypes/PKGBUILD-darcs.proto index 7f0fd66..7fbc1cb 100644 --- a/prototypes/PKGBUILD-darcs.proto +++ b/prototypes/PKGBUILD-darcs.proto @@ -36,8 +36,7 @@ build() { if [[ -d "$_darcsmod/_darcs" ]]; then msg "Retrieving missing patches" - cd "$_darcsmod" - darcs pull -a "$_darcstrunk/$_darcsmod" + cd "$_darcsmod" && darcs pull -a "$_darcstrunk/$_darcsmod" cd .. else msg "Retrieving complete sources" diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto index 77d499d..10b2cd1 100644 --- a/prototypes/PKGBUILD-hg.proto +++ b/prototypes/PKGBUILD-hg.proto @@ -35,8 +35,7 @@ build() { msg "Connecting to Mercurial server...." if [[ -d "$_hgrepo" ]]; then - cd "$_hgrepo" - hg pull -u + cd "$_hgrepo" && hg pull -u msg "The local files are updated." cd .. else diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto index 64b23c4..6f5a825 100644 --- a/prototypes/PKGBUILD-svn.proto +++ b/prototypes/PKGBUILD-svn.proto @@ -35,7 +35,7 @@ build() { msg "Connecting to SVN server...." if [[ -d "$_svnmod/.svn" ]]; then - (cd "$_svnmod" && svn up -r "$pkgver") + cd "$_svnmod" && svn up -r "$pkgver" cd .. else svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod" -- 1.7.7.2

1 0

[arch-projects] [ABS] [PATCH v2 3/7] vcs prototypes: simplify code
by Linus Arver 03 Nov '11

03 Nov '11

Since the $PWD after the update/initial clone is always "$srcdir", we don't need to reference it later on. Signed-off-by: Linus Arver <linusarver(a)gmail.com> --- prototypes/PKGBUILD-bzr.proto | 6 +++--- prototypes/PKGBUILD-cvs.proto | 6 +++--- prototypes/PKGBUILD-darcs.proto | 6 +++--- prototypes/PKGBUILD-git.proto | 6 +++--- prototypes/PKGBUILD-hg.proto | 6 +++--- prototypes/PKGBUILD-svn.proto | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto index f47844b..6f36205 100644 --- a/prototypes/PKGBUILD-bzr.proto +++ b/prototypes/PKGBUILD-bzr.proto @@ -45,9 +45,9 @@ build() { 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" + rm -rf "$_bzrmod-build" + cp -r "$_bzrmod" "$_bzrmod-build" + cd "$_bzrmod-build" # # BUILD HERE diff --git a/prototypes/PKGBUILD-cvs.proto b/prototypes/PKGBUILD-cvs.proto index a5a9fd1..ea12d69 100644 --- a/prototypes/PKGBUILD-cvs.proto +++ b/prototypes/PKGBUILD-cvs.proto @@ -45,9 +45,9 @@ build() { 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" + rm -rf "$_cvsmod-build" + cp -r "$_cvsmod" "$_cvsmod-build" + cd "$_cvsmod-build" # # BUILD HERE diff --git a/prototypes/PKGBUILD-darcs.proto b/prototypes/PKGBUILD-darcs.proto index 008526d..7f0fd66 100644 --- a/prototypes/PKGBUILD-darcs.proto +++ b/prototypes/PKGBUILD-darcs.proto @@ -44,9 +44,9 @@ build() { darcs get --partial --set-scripts-executable "$_darcstrunk/$_darcsmod" fi - rm -rf "$srcdir/$_darcsmod-build" - cp -r "$srcdir/$_darcsmod" "$srcdir/$_darcsmod-build" - cd "$srcdir/$_darcsmod-build" + rm -rf "$_darcsmod-build" + cp -r "$_darcsmod" "$_darcsmod-build" + cd "$_darcsmod-build" msg "Starting build..." diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto index 4e6a42e..08ed0f2 100644 --- a/prototypes/PKGBUILD-git.proto +++ b/prototypes/PKGBUILD-git.proto @@ -45,9 +45,9 @@ build() { 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" + rm -rf "$_gitname-build" + git clone "$_gitname" "$_gitname-build" + cd "$_gitname-build" # # BUILD HERE diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto index ada253b..77d499d 100644 --- a/prototypes/PKGBUILD-hg.proto +++ b/prototypes/PKGBUILD-hg.proto @@ -46,9 +46,9 @@ build() { 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" + rm -rf "$_hgrepo-build" + cp -r "$_hgrepo" "$_hgrepo-build" + cd "$_hgrepo-build" # # BUILD HERE diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto index 33599c1..64b23c4 100644 --- a/prototypes/PKGBUILD-svn.proto +++ b/prototypes/PKGBUILD-svn.proto @@ -44,9 +44,9 @@ build() { msg "SVN checkout done or server timeout" msg "Starting build..." - rm -rf "$srcdir/$_svnmod-build" - cp -r "$srcdir/$_svnmod" "$srcdir/$_svnmod-build" - cd "$srcdir/$_svnmod-build" + rm -rf "$_svnmod-build" + cp -r "$_svnmod" "$_svnmod-build" + cd "$_svnmod-build" # # BUILD HERE -- 1.7.7.2

1 0

[arch-projects] [ABS] [PATCH v2 2/7] vcs prototypes: consistent $PWD after checkout
by Linus Arver 03 Nov '11

03 Nov '11

Before, some vcs prototypes (bzr, git, hg, svn) cd'ed into the repo directory after a checkout, but not on an initial clone. The cvs/darcs prototypes made it uniform by always going into the repo after the checkout, whether on an initial clone or an update. With this change, we make all vcs prototypes simply not remain in the repo directory after a checkout (whether initial clone or update). Of course, the other alternative is to always remain in the repo directory after a checkout, but in principal one rarely needs to do work inside the checked-out directory after a pull/update, so this way is better. Signed-off-by: Linus Arver <linusarver(a)gmail.com> --- prototypes/PKGBUILD-bzr.proto | 1 + prototypes/PKGBUILD-cvs.proto | 2 +- prototypes/PKGBUILD-darcs.proto | 2 +- prototypes/PKGBUILD-git.proto | 1 + prototypes/PKGBUILD-hg.proto | 1 + prototypes/PKGBUILD-svn.proto | 1 + 6 files changed, 6 insertions(+), 2 deletions(-) diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto index 1134d62..f47844b 100644 --- a/prototypes/PKGBUILD-bzr.proto +++ b/prototypes/PKGBUILD-bzr.proto @@ -37,6 +37,7 @@ build() { if [[ -d "$_bzrmod" ]]; then cd "$_bzrmod" && bzr --no-plugins pull "$_bzrtrunk" -r "$pkgver" msg "The local files are updated." + cd .. else bzr --no-plugins branch "$_bzrtrunk" "$_bzrmod" -q -r "$pkgver" fi diff --git a/prototypes/PKGBUILD-cvs.proto b/prototypes/PKGBUILD-cvs.proto index 7727064..a5a9fd1 100644 --- a/prototypes/PKGBUILD-cvs.proto +++ b/prototypes/PKGBUILD-cvs.proto @@ -37,9 +37,9 @@ build() { if [[ -d "$_cvsmod/CVS" ]]; then cd "$_cvsmod" cvs -z3 update -d + cd .. else cvs -z3 -d "$_cvsroot" co -D "$pkgver" -f "$_cvsmod" - cd "$_cvsmod" fi msg "CVS checkout done or server timeout" diff --git a/prototypes/PKGBUILD-darcs.proto b/prototypes/PKGBUILD-darcs.proto index b077246..008526d 100644 --- a/prototypes/PKGBUILD-darcs.proto +++ b/prototypes/PKGBUILD-darcs.proto @@ -38,10 +38,10 @@ build() { msg "Retrieving missing patches" cd "$_darcsmod" darcs pull -a "$_darcstrunk/$_darcsmod" + cd .. else msg "Retrieving complete sources" darcs get --partial --set-scripts-executable "$_darcstrunk/$_darcsmod" - cd "$_darcsmod" fi rm -rf "$srcdir/$_darcsmod-build" diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto index ea55126..4e6a42e 100644 --- a/prototypes/PKGBUILD-git.proto +++ b/prototypes/PKGBUILD-git.proto @@ -37,6 +37,7 @@ build() { if [[ -d "$_gitname" ]]; then cd "$_gitname" && git pull origin msg "The local files are updated." + cd .. else git clone "$_gitroot" "$_gitname" fi diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto index 1d3d56f..ada253b 100644 --- a/prototypes/PKGBUILD-hg.proto +++ b/prototypes/PKGBUILD-hg.proto @@ -38,6 +38,7 @@ build() { cd "$_hgrepo" hg pull -u msg "The local files are updated." + cd .. else hg clone "$_hgroot" "$_hgrepo" fi diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto index b4534e7..33599c1 100644 --- a/prototypes/PKGBUILD-svn.proto +++ b/prototypes/PKGBUILD-svn.proto @@ -36,6 +36,7 @@ build() { if [[ -d "$_svnmod/.svn" ]]; then (cd "$_svnmod" && svn up -r "$pkgver") + cd .. else svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod" fi -- 1.7.7.2

1 0

[arch-projects] [ABS] [PATCH v2 1/7] vcs prototypes: hint removal of build directories after making package
by Linus Arver 03 Nov '11

03 Nov '11

For all vcs prototypes, we currently create a temporary build directory. However, we do not delete it after we are done creating the package. This wastes disk space as far as all AUR end-users are concerned. On the other hand, package maintainers who rely on the prototypes as a template for creating new packages will get bitten by this if they ever need to repackage the contents of a package with "makepkg --repackage". The solution is to add a comment encouraging the deletion of the build directory once the packager is 100% sure that the PKGBUILD is correct. Hopefully, this will encourage PKGBUILD creators (AUR package maintainers especially) to cut down on unnecessary disk space pollution. Signed-off-by: Linus Arver <linusarver(a)gmail.com> --- prototypes/PKGBUILD-bzr.proto | 5 +++++ prototypes/PKGBUILD-cvs.proto | 5 +++++ prototypes/PKGBUILD-darcs.proto | 5 +++++ prototypes/PKGBUILD-git.proto | 5 +++++ prototypes/PKGBUILD-hg.proto | 5 +++++ prototypes/PKGBUILD-svn.proto | 5 +++++ 6 files changed, 30 insertions(+), 0 deletions(-) diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto index 81f145f..1134d62 100644 --- a/prototypes/PKGBUILD-bzr.proto +++ b/prototypes/PKGBUILD-bzr.proto @@ -59,6 +59,11 @@ build() { package() { cd "$srcdir/$_bzrmod-build" make DESTDIR="$pkgdir/" install + + # Uncomment to remove the build directory to save space once you are 100% + # sure the resulting package is correct and there is no need to invoke + # "makepkg --repackage". + #rm -rf "$srcdir/$_bzrmod-build" } # vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-cvs.proto b/prototypes/PKGBUILD-cvs.proto index 982c149..7727064 100644 --- a/prototypes/PKGBUILD-cvs.proto +++ b/prototypes/PKGBUILD-cvs.proto @@ -60,6 +60,11 @@ build() { package() { cd "$srcdir/$_cvsmod-build" make DESTDIR="$pkgdir/" install + + # Uncomment to remove the build directory to save space once you are 100% + # sure the resulting package is correct and there is no need to invoke + # "makepkg --repackage". + #rm -rf "$srcdir/$_cvsmod-build" } # vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-darcs.proto b/prototypes/PKGBUILD-darcs.proto index 979e9b5..b077246 100644 --- a/prototypes/PKGBUILD-darcs.proto +++ b/prototypes/PKGBUILD-darcs.proto @@ -61,6 +61,11 @@ build() { package() { cd "$srcdir/$_darcsmod-build" make DESTDIR="$pkgdir/" install + + # Uncomment to remove the build directory to save space once you are 100% + # sure the resulting package is correct and there is no need to invoke + # "makepkg --repackage". + #rm -rf "$srcdir/$_darcsmod-build" } # vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto index 05b721b..ea55126 100644 --- a/prototypes/PKGBUILD-git.proto +++ b/prototypes/PKGBUILD-git.proto @@ -59,6 +59,11 @@ build() { package() { cd "$srcdir/$_gitname-build" make DESTDIR="$pkgdir/" install + + # Uncomment to remove the build directory to save space once you are 100% + # sure the resulting package is correct and there is no need to invoke + # "makepkg --repackage". + #rm -rf "$srcdir/$_gitname-build" } # vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto index 8474533..1d3d56f 100644 --- a/prototypes/PKGBUILD-hg.proto +++ b/prototypes/PKGBUILD-hg.proto @@ -60,6 +60,11 @@ build() { package() { cd "$srcdir/$_hgrepo-build" make DESTDIR="$pkgdir/" install + + # Uncomment to remove the build directory to save space once you are 100% + # sure the resulting package is correct and there is no need to invoke + # "makepkg --repackage". + #rm -rf "$srcdir/$_hgrepo-build" } # vim:set ts=2 sw=2 et: diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto index a08e0e3..b4534e7 100644 --- a/prototypes/PKGBUILD-svn.proto +++ b/prototypes/PKGBUILD-svn.proto @@ -58,6 +58,11 @@ build() { package() { cd "$srcdir/$_svnmod-build" make DESTDIR="$pkgdir/" install + + # Uncomment to remove the build directory to save space once you are 100% + # sure the resulting package is correct and there is no need to invoke + # "makepkg --repackage". + #rm -rf "$srcdir/$_svnmod-build" } # vim:set ts=2 sw=2 et: -- 1.7.7.2

1 0

[arch-projects] [ABS] [PATCH 5/6] vcs prototypes: more efficient temp build directories
by Linus Arver 03 Nov '11

03 Nov '11

The bzr, darcs, git, and hg version control systems use a single internal folder at the root to store all VCS-related data (commits, history, etc.). This folder can get quite large (hundreds of MiB) for big projects and continues to grow as the project lives on. We exclude this folder when creating a temporary build directory to save time and space. CVS and SVN pollute the source repo with "CVS" and ".svn" directories recursively for every single directory, so there is no simple one-liner solution to exclude the VCS data for these systems. Signed-off-by: Linus Arver <linusarver(a)gmail.com> --- prototypes/PKGBUILD-bzr.proto | 6 ++++-- prototypes/PKGBUILD-darcs.proto | 6 ++++-- prototypes/PKGBUILD-git.proto | 6 ++++-- prototypes/PKGBUILD-hg.proto | 6 ++++-- 4 files changed, 16 insertions(+), 8 deletions(-) diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto index a01eea8..ef7187d 100644 --- a/prototypes/PKGBUILD-bzr.proto +++ b/prototypes/PKGBUILD-bzr.proto @@ -47,8 +47,10 @@ build() { msg "Starting build..." rm -rf "$_bzrmod-build" - cp -r "$_bzrmod" "$_bzrmod-build" - cd "$_bzrmod-build" + mkdir $_bzrmod-build + cd $_bzrmod + ls -A | grep -v .bzr | xargs -d '\n' cp -r -t ../"$_bzrmod-build" + cd ../"$_bzrmod-build" # # BUILD HERE diff --git a/prototypes/PKGBUILD-darcs.proto b/prototypes/PKGBUILD-darcs.proto index a55a346..affd2c8 100644 --- a/prototypes/PKGBUILD-darcs.proto +++ b/prototypes/PKGBUILD-darcs.proto @@ -45,8 +45,10 @@ build() { fi rm -rf "$_darcsmod-build" - cp -r "$_darcsmod" "$_darcsmod-build" - cd "$_darcsmod-build" + mkdir $_darcsmod-build + cd $_darcsmod + ls -A | grep -v _darcs | xargs -d '\n' cp -r -t ../"$_darcsmod-build" + cd ../"$_darcsmod-build" msg "Starting build..." diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto index 88bc76b..75edb8b 100644 --- a/prototypes/PKGBUILD-git.proto +++ b/prototypes/PKGBUILD-git.proto @@ -47,8 +47,10 @@ build() { msg "Starting build..." rm -rf "$_gitname-build" - git clone "$_gitname" "$_gitname-build" - cd "$_gitname-build" + mkdir $_gitname-build + cd $_gitname + ls -A | grep -v .git | xargs -d '\n' cp -r -t ../"$_gitname-build" + cd ../"$_gitname-build" # # BUILD HERE diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto index 6f54af8..8927fbf 100644 --- a/prototypes/PKGBUILD-hg.proto +++ b/prototypes/PKGBUILD-hg.proto @@ -47,8 +47,10 @@ build() { msg "Starting build..." rm -rf "$_hgrepo-build" - cp -r "$_hgrepo" "$_hgrepo-build" - cd "$_hgrepo-build" + mkdir $_hgrepo-build + cd $_hgrepo + ls -A | grep -v .hg | xargs -d '\n' cp -r -t ../"$_hgrepo-build" + cd ../"$_hgrepo-build" # # BUILD HERE -- 1.7.7.1

2 7

[arch-projects] [ABS] [PATCH 4/6] vcs prototypes: consistent coding style
by Linus Arver 03 Nov '11

03 Nov '11

Some vcs prototypes do something like cd repo && update while others do it like cd repo update to update an existing repo. It makes sense to have them all do it the second way, because the code is already inside an if block that checks if the repo directory exists. Signed-off-by: Linus Arver <linusarver(a)gmail.com> --- prototypes/PKGBUILD-bzr.proto | 3 ++- prototypes/PKGBUILD-git.proto | 3 ++- prototypes/PKGBUILD-svn.proto | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto index 24eebe4..a01eea8 100644 --- a/prototypes/PKGBUILD-bzr.proto +++ b/prototypes/PKGBUILD-bzr.proto @@ -35,7 +35,8 @@ build() { msg "Connecting to Bazaar server...." if [[ -d "$_bzrmod" ]]; then - cd "$_bzrmod" && bzr --no-plugins pull "$_bzrtrunk" -r "$pkgver" + cd "$_bzrmod" + bzr --no-plugins pull "$_bzrtrunk" -r "$pkgver" msg "The local files are updated." cd .. else diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto index 22eba7a..88bc76b 100644 --- a/prototypes/PKGBUILD-git.proto +++ b/prototypes/PKGBUILD-git.proto @@ -35,7 +35,8 @@ build() { msg "Connecting to GIT server...." if [[ -d "$_gitname" ]]; then - cd "$_gitname" && git pull origin + cd "$_gitname" + git pull origin msg "The local files are updated." cd .. else diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto index 27d34fe..2ff37ee 100644 --- a/prototypes/PKGBUILD-svn.proto +++ b/prototypes/PKGBUILD-svn.proto @@ -35,7 +35,8 @@ build() { msg "Connecting to SVN server...." if [[ -d "$_svnmod/.svn" ]]; then - (cd "$_svnmod" && svn up -r "$pkgver") + cd "$_svnmod" + svn up -r "$pkgver" cd .. else svn co "$_svntrunk" --config-dir ./ -r "$pkgver" "$_svnmod" -- 1.7.7.1

2 2

[arch-projects] [ABS] [PATCH 6/6] git prototype: on initial clones, perform a shallow clone
by Linus Arver 03 Nov '11

03 Nov '11

Definition: shallow git clones are just like regular clones, but do not contain any of the past commit history. It is virtually the same thing as doing a regular clone, then doing a rebase to squash all commits into a single commit. Many people who do not understand git dismiss shallow clones because they wrongly believe that shallow clones are incapable of pulling in changes going forward from the remote. This is not the case! You can still do pulls from the master remote repo in the future to update the shallow clone, just like a regular clone! Now, when doing an inital clone, we should *always* encourage PKGBUILD authors to do a shallow clone. This will save time (less downloading) and disk space (e.g., yaourt users). The savings can be hundreds of MiB for large git repos. Advanced PKGBUILD authors who need to pull in an older version of the remote repo will already have the knowledge to remove the "--depth 1" to suit their needs. This change will also help AUR packagers out there who do not understand git at all to make this change themselves. Signed-off-by: Linus Arver <linusarver(a)gmail.com> --- prototypes/PKGBUILD-git.proto | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto index 75edb8b..22ff371 100644 --- a/prototypes/PKGBUILD-git.proto +++ b/prototypes/PKGBUILD-git.proto @@ -40,7 +40,7 @@ build() { msg "The local files are updated." cd .. else - git clone "$_gitroot" "$_gitname" + git clone --depth 1 "$_gitroot" "$_gitname" fi msg "GIT checkout done or server timeout" -- 1.7.7.1

1 0

[arch-projects] [ABS] [PATCH 3/6] vcs prototypes: simplify code
by Linus Arver 03 Nov '11

03 Nov '11

Since the $PWD after the update/initial clone is always "$srcdir", we don't need to reference it later on. Signed-off-by: Linus Arver <linusarver(a)gmail.com> --- prototypes/PKGBUILD-bzr.proto | 6 +++--- prototypes/PKGBUILD-cvs.proto | 6 +++--- prototypes/PKGBUILD-darcs.proto | 6 +++--- prototypes/PKGBUILD-git.proto | 6 +++--- prototypes/PKGBUILD-hg.proto | 6 +++--- prototypes/PKGBUILD-svn.proto | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/prototypes/PKGBUILD-bzr.proto b/prototypes/PKGBUILD-bzr.proto index 629525a..24eebe4 100644 --- a/prototypes/PKGBUILD-bzr.proto +++ b/prototypes/PKGBUILD-bzr.proto @@ -45,9 +45,9 @@ build() { 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" + rm -rf "$_bzrmod-build" + cp -r "$_bzrmod" "$_bzrmod-build" + cd "$_bzrmod-build" # # BUILD HERE diff --git a/prototypes/PKGBUILD-cvs.proto b/prototypes/PKGBUILD-cvs.proto index cc0d86f..cf81a59 100644 --- a/prototypes/PKGBUILD-cvs.proto +++ b/prototypes/PKGBUILD-cvs.proto @@ -45,9 +45,9 @@ build() { 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" + rm -rf "$_cvsmod-build" + cp -r "$_cvsmod" "$_cvsmod-build" + cd "$_cvsmod-build" # # BUILD HERE diff --git a/prototypes/PKGBUILD-darcs.proto b/prototypes/PKGBUILD-darcs.proto index 1687306..a55a346 100644 --- a/prototypes/PKGBUILD-darcs.proto +++ b/prototypes/PKGBUILD-darcs.proto @@ -44,9 +44,9 @@ build() { darcs get --partial --set-scripts-executable "$_darcstrunk/$_darcsmod" fi - rm -rf "$srcdir/$_darcsmod-build" - cp -r "$srcdir/$_darcsmod" "$srcdir/$_darcsmod-build" - cd "$srcdir/$_darcsmod-build" + rm -rf "$_darcsmod-build" + cp -r "$_darcsmod" "$_darcsmod-build" + cd "$_darcsmod-build" msg "Starting build..." diff --git a/prototypes/PKGBUILD-git.proto b/prototypes/PKGBUILD-git.proto index 17c2ce6..22eba7a 100644 --- a/prototypes/PKGBUILD-git.proto +++ b/prototypes/PKGBUILD-git.proto @@ -45,9 +45,9 @@ build() { 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" + rm -rf "$_gitname-build" + git clone "$_gitname" "$_gitname-build" + cd "$_gitname-build" # # BUILD HERE diff --git a/prototypes/PKGBUILD-hg.proto b/prototypes/PKGBUILD-hg.proto index 1c3e8f2..6f54af8 100644 --- a/prototypes/PKGBUILD-hg.proto +++ b/prototypes/PKGBUILD-hg.proto @@ -46,9 +46,9 @@ build() { 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" + rm -rf "$_hgrepo-build" + cp -r "$_hgrepo" "$_hgrepo-build" + cd "$_hgrepo-build" # # BUILD HERE diff --git a/prototypes/PKGBUILD-svn.proto b/prototypes/PKGBUILD-svn.proto index 9fba37f..27d34fe 100644 --- a/prototypes/PKGBUILD-svn.proto +++ b/prototypes/PKGBUILD-svn.proto @@ -44,9 +44,9 @@ build() { msg "SVN checkout done or server timeout" msg "Starting build..." - rm -rf "$srcdir/$_svnmod-build" - cp -r "$srcdir/$_svnmod" "$srcdir/$_svnmod-build" - cd "$srcdir/$_svnmod-build" + rm -rf "$_svnmod-build" + cp -r "$_svnmod" "$_svnmod-build" + cd "$_svnmod-build" # # BUILD HERE -- 1.7.7.1

1 0