bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* Added some backwards compatability stuff to makepkg, along with helpful

Browse source 
warnings so people aren't caught off guard in the future.
* Added a temp fix for a bug in file 4.19 where bziped tarballs were
  returning type "application/empty".
This commit is contained in:
Dan McGee 2007-02-06 06:54:13 +00:00
parent 2f23b69af8
commit 26e7d16d0e
1 changed files with 21 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
scripts/makepkg
View file

@ -120,6 +120,16 @@ check_option() {
elif [ "$lc" = "!$needle" ]; then elif [ "$lc" = "!$needle" ]; then
echo "n" echo "n"
return return
# START DEPRICATED
# TODO This code should be removed in the next release of makepkg
elif [ "$lc" = "no$needle" ]; then
warning "Options beginning with 'no' will be depricated in the next version of makepkg!"
plain "Please replace 'no' with '!': no$needle -> !$needle."
echo "n"
return
elif [ "$lc" = "keepdocs" -a "$needle" = "docs" ]; then
warning "Option 'keepdocs' may not work as intended. Please replace with 'docs'."
# END DEPRICATED
fi fi
done done
# fall back to makepkg.conf options # fall back to makepkg.conf options
@ -542,17 +552,16 @@ if [ "$EUID" != "0" ]; then
fakeroot -- $0 -F $ARGLIST fakeroot -- $0 -F $ARGLIST
exit $? exit $?
else else
warning "Fakeroot is not installed. Building as an unprivileged user" warning "Fakeroot is not installed. Building as an unprivileged user"
plain "will result in non-root ownership of the packaged files." plain "will result in non-root ownership of the packaged files. Install"
plain "Install the fakeroot package to correctly build as a non-root" plain "the fakeroot package to correctly build as a non-root user."
plain "user."
plain "" plain ""
sleep 1 sleep 1
fi fi
else else
warning "Running makepkg as an unprivileged user will result in non-root" warning "Running makepkg as an unprivileged user will result in non-root"
plain "ownership of the packaged files. Try using the fakeroot" plain "ownership of the packaged files. Try using the fakeroot environment"
plain "environment. ('fakeroot' in BUILDENV in makepkg.conf)" plain "by placing 'fakeroot' in the BUILDENV array in makepkg.conf."
plain "" plain ""
sleep 1 sleep 1
fi fi
@ -738,6 +747,12 @@ else
file_type=$(file -biz "$file") file_type=$(file -biz "$file")
unset cmd unset cmd
case "$file_type" in case "$file_type" in
# START REMOVE
# TODO remove this with release of file v4.20, temp bugfix
*application/empty*)
cmd="tar -xf $file" ;;
warning "file had trouble detecting type, assuming tar"
# END REMOVE
*application/x-tar*) *application/x-tar*)
cmd="tar -xf $file" ;; cmd="tar -xf $file" ;;
*application/x-zip*) *application/x-zip*)