Skip to content

Commit

Permalink
Fix typo. Add docker image help as well to dmakepkg
Browse files Browse the repository at this point in the history
  • Loading branch information
justin8 committed Dec 17, 2015
1 parent 02f6a07 commit 6744d3d
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 11 deletions.
23 changes: 13 additions & 10 deletions dmakepkg
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/bin/bash

set -e
name=$(basename $0)_$(uuidgen)
name="$(basename $0)_$(uuidgen)"
set +e
CACHE=''
MAKEPKG=''
Expand All @@ -27,6 +27,9 @@ do
case $OPTION in
h)
usage
echo '---------------------------------------'
docker run --rm --name=$name justin8/makepkg -h
exit 0
;;
x)
[[ -e '/etc/pacman.conf' ]] && CONF='-v /etc/pacman.conf:/etc/pacman.conf'
Expand Down Expand Up @@ -68,18 +71,18 @@ then
fi
fi

docker run --name $name \
docker run --name "$name" \
--rm \
--net=host \
-v $(pwd):/src \
$CACHE \
$CONF \
$MAKEPKG \
$SRCDEST \
$PKGDEST \
$SRCPKGDEST \
$LOGDEST \
justin8/makepkg -u $EUID -g $(id -g $EUID) $@
"$CACHE" \
"$CONF" \
"$MAKEPKG" \
"$SRCDEST" \
"$PKGDEST" \
"$SRCPKGDEST" \
"$LOGDEST" \
justin8/makepkg -u "$EUID" -g "$(id -g $EUID)" "$@"
rc=$?

exit $rc
2 changes: 1 addition & 1 deletion run.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ usage() {
cat <<-EOF
usage: $(basename "$0") [OPTIONS] [makepkg parameters]
This wrapper for makepkg will default to running with '--force --syncdesp --noconfirm'.
This wrapper for makepkg will default to running with '--force --syncdeps --noconfirm'.
Any unrecognized parameters will be passed directly through to makepkg.
OPTIONS:
Expand Down

0 comments on commit 6744d3d

Please sign in to comment.