fix stuffz

pull/2/head
Joseph Werle 10 years ago
parent 487c69c0d7
commit 497a0e76de

@ -0,0 +1,18 @@
BIN ?= bpkg
PREFIX ?= /usr/local
CMDS = json install package
install: uninstall
install $(BIN) $(PREFIX)/bin
for cmd in $(CMDS); do cp $(BIN)-$${cmd} $(PREFIX)/bin; done
uninstall:
rm -f $(PREFIX)/bin/$(BIN)
for cmd in $(CMDS); do rm -f $(PREFIX)/bin/$(BIN)-$${cmd}; done
link: uninstall
ln -s $(BIN) $(PREFIX)/bin/$(BIN)
for cmd in $(CMDS); do ln -s $(BIN)-$${cmd} $(PREFIX)/bin; done
unlink: uninstall

@ -6,8 +6,8 @@ BPKG_USER="${BPKG_USER:-"bpkg"}"
## outut usage
usage () {
echo "usage: bpkg-install [-h|--help]"
echo " or: bpkg-install <package>"
echo " or: bpkg-install <user>/<package>"
echo " or: bpkg-install [-g|--global] <package>"
echo " or: bpkg-install [-g|--global] <user>/<package>"
}
## Install a bash package
@ -21,6 +21,7 @@ bpkg_install () {
local version=""
local status=""
local json=""
local let needs_global=0
declare -a local parts=()
declare -a local scripts=()
@ -29,6 +30,12 @@ bpkg_install () {
usage
return 0
;;
-g|--global)
shift
needs_global=1
pkg="${1}"
;;
esac
## ensure there is a package to install
@ -117,9 +124,14 @@ bpkg_install () {
## get package name from `package.json'
name="$(echo -n ${json} | bpkg-json -b | grep 'name' | awk '{ print $2 }' | tr -d '\"')"
if [ "${#scripts[@]}" -gt "0" ]; then
if [ "1" = "${needs_global}" ]; then
## install bin if needed
echo
elif [ "${#scripts[@]}" -gt "0" ]; then
## make `deps/' directory if possible
mkdir -p "${cwd}/deps/${name}"
## copy package.json over
curl -sL "${url}/package.json" -o "${cwd}/deps/${name}/package.json"
## grab each script and place in deps directory
for (( i = 0; i < ${#scripts[@]} ; ++i )); do
(

@ -37,7 +37,7 @@ bpkg_package () {
## show value for a specific property
## in `package.json'
{
cat "${pkg}" | bpkg-json -b | grep "${prop}" | awk '{ printf $2 }'
cat "${pkg}" | bpkg-json -b | grep "${prop}" | awk '{ $1=""; printf $0 }'
echo
}
fi

@ -5,5 +5,7 @@
"global": true,
"scripts": [ "bpkg.sh" ],
"bin": { "bpkg": "bpkg.sh" },
"dependencies": { }
"dependencies": {
"jwerle/term.sh": "*"
}
}

Loading…
Cancel
Save