summaryrefslogtreecommitdiff
path: root/makechrootpkg.in
diff options
context:
space:
mode:
authorJan Alexander Steffens (heftig) <jan.steffens@gmail.com>2011-09-17 14:56:49 +0200
committerLukas Fleischer <archlinux@cryptocrack.de>2011-10-07 21:53:03 +0200
commite41deee5e5d471e90b951b1f68db5dc50c343b0c (patch)
tree9180a923a3300005411596c54c5455310d4bbfb2 /makechrootpkg.in
parent004ced2a33c06985d88b424d88facb0d8b1bdd27 (diff)
makechrootpkg: Replace $workdir with . ($PWD)
$workdir is never used when we change directory, so it's superfluous. Signed-off-by: Lukas Fleischer <archlinux@cryptocrack.de>
Diffstat (limited to 'makechrootpkg.in')
-rw-r--r--makechrootpkg.in7
1 files changed, 3 insertions, 4 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 5538e95..eb23c61 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -8,7 +8,6 @@
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-workdir="$PWD"
makepkg_args='-s --noconfirm'
repack=false
update_first=false
@@ -274,12 +273,12 @@ if mkarchroot -r "/chrootbuild" "$copydir"; then
if [[ -d $PKGDEST ]]; then
mv "$pkgfile" "$PKGDEST"
else
- mv "$pkgfile" "$workdir"
+ mv "$pkgfile" .
fi
done
for l in "$copydir"/build/{namcap,*-{build,check,package,package_*}}.log; do
- [[ -f $l ]] && mv "$l" "$workdir"
+ [[ -f $l ]] && mv "$l" .
done
else
# Just in case. We returned 1, make sure we fail
@@ -291,7 +290,7 @@ for f in "$copydir"/srcdest/*; do
if [[ -d $SRCDEST ]]; then
mv "$f" "$SRCDEST"
else
- mv "$f" "$workdir"
+ mv "$f" .
fi
done