2
0

Handle dependencies unpacked by a package manager.

This commit is contained in:
Maarten Billemont 2015-01-19 20:58:53 -05:00
parent 0c2e182039
commit b34f7377da
2 changed files with 14 additions and 7 deletions

View File

@ -81,11 +81,15 @@ unpack() {
mv "$files"/* . mv "$files"/* .
rmdir "$files" rmdir "$files"
fi fi
touch .unpacked
} }
fetchSource() ( fetchSource() (
source .source source .source
if [[ $pkg && -e "${pkg##*/}" ]]; then if [[ -e .unpacked ]]; then
true
elif [[ $pkg && -e "${pkg##*/}" ]]; then
files=( !("${pkg##*/}") ) files=( !("${pkg##*/}") )
[[ -e $files ]] || { [[ -e $files ]] || {
echo echo
@ -135,11 +139,14 @@ fetchSource() (
exit 1 exit 1
fi fi
for patch in "${patches[@]}"; do if [[ ! -e .patched ]] && (( ${#patches[@]} )); then
echo for patch in "${patches[@]}"; do
echo "Patching: ${PWD##*/}, for $patch..." echo
patch -p0 < ../"${PWD##*/}-$patch.patch" echo "Patching: ${PWD##*/}, for $patch..."
done patch -p0 < ../"${PWD##*/}-$patch.patch"
done
touch .patched
fi
) )
depend() { depend() {

View File

@ -3,4 +3,4 @@ set -e
cd "${BASH_SOURCE[0]%/*}" cd "${BASH_SOURCE[0]%/*}"
s3cmd sync --exclude '.git/**' --delete-removed --follow-symlinks --preserve --acl-public --reduced-redundancy . s3://masterpasswordapp.com/ s3cmd sync --exclude '.git/**' --delete-removed --follow-symlinks --preserve --acl-public --reduced-redundancy . s3://masterpasswordapp.com/
rsync -avP --no-group . satura.lyndir.com:/usr/local/www/masterpasswordapp.com/htdocs-secure/ rsync -avPL --no-group . satura.lyndir.com:/usr/local/www/masterpasswordapp.com/htdocs-secure/