preventing double install

The existing behaviour was to perform a global install in addition to
a local one rather than instead of.

fixes #70
pull/73/head
Benoit Hiller 8 years ago
parent c746f3618e
commit 5916a6b3de

@ -363,36 +363,38 @@ bpkg_install_from_remote () {
## clean up
rm -rf ${name}-${version}
)}
fi
if [ "${#scripts[@]}" -gt "0" ]; then
## grab each script and place in deps directory
for (( i = 0; i < ${#scripts[@]} ; ++i )); do
(
local script="$(echo ${scripts[$i]} | xargs basename )"
info "fetch" "${url}/${script}"
info "write" "${cwd}/deps/${name}/${script}"
curl $auth_param -sL "${url}/${script}" -o "${cwd}/deps/${name}/${script}"
local scriptname="${script%.*}"
info "${scriptname} to PATH" "${cwd}/deps/bin/${scriptname}"
ln -si "${cwd}/deps/${name}/${script}" "${cwd}/deps/bin/${scriptname}"
chmod u+x "${cwd}/deps/bin/${scriptname}"
)
done
fi
if [ "${#files[@]}" -gt "0" ]; then
## grab each file
for (( i = 0; i < ${#files[@]} ; ++i )); do
(
local file="$(echo ${files[$i]})"
local filedir="$(dirname "${cwd}/deps/${name}/${file}")"
info "fetch" "${url}/${file}"
if [ ! -d "$filedir" ]; then
mkdir -p "$filedir"
fi
info "write" "${filedir}/${file}"
curl $auth_param -sL "${url}/${script}" -o "${filedir}/${file}"
)
done
## perform local install otherwise
else
if [ "${#scripts[@]}" -gt "0" ]; then
## grab each script and place in deps directory
for (( i = 0; i < ${#scripts[@]} ; ++i )); do
(
local script="$(echo ${scripts[$i]} | xargs basename )"
info "fetch" "${url}/${script}"
info "write" "${cwd}/deps/${name}/${script}"
curl $auth_param -sL "${url}/${script}" -o "${cwd}/deps/${name}/${script}"
local scriptname="${script%.*}"
info "${scriptname} to PATH" "${cwd}/deps/bin/${scriptname}"
ln -si "${cwd}/deps/${name}/${script}" "${cwd}/deps/bin/${scriptname}"
chmod u+x "${cwd}/deps/bin/${scriptname}"
)
done
fi
if [ "${#files[@]}" -gt "0" ]; then
## grab each file
for (( i = 0; i < ${#files[@]} ; ++i )); do
(
local file="$(echo ${files[$i]})"
local filedir="$(dirname "${cwd}/deps/${name}/${file}")"
info "fetch" "${url}/${file}"
if [ ! -d "$filedir" ]; then
mkdir -p "$filedir"
fi
info "write" "${filedir}/${file}"
curl $auth_param -sL "${url}/${script}" -o "${filedir}/${file}"
)
done
fi
fi
return 0
}

Loading…
Cancel
Save