mir/sudo
2
0
Fork 0
mirror of https://github.com/sudo-project/sudo.git synced 2025-08-22 01:49:11 +00:00
Code Issues Releases Wiki Activity

Fix macOS package creation.

Browse Source
This commit is contained in:
Todd C. Miller 2020-04-22 08:58:07 -06:00
parent 557be2b0b1
commit d5b06ff7fa
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/pp
View File

@ -1,6 +1,6 @@
#!/bin/sh #!/bin/sh
# Copyright 2020 One Identity LLC. ALL RIGHTS RESERVED # Copyright 2020 One Identity LLC. ALL RIGHTS RESERVED
pp_revision="20200421" pp_revision="20200422"
# Copyright 2018 One Identity LLC. ALL RIGHTS RESERVED. # Copyright 2018 One Identity LLC. ALL RIGHTS RESERVED.
# #
# Redistribution and use in source and binary forms, with or without # Redistribution and use in source and binary forms, with or without
@ -7340,7 +7340,8 @@ pp_backend_macos_flat () {
# build the flat package layout # build the flat package layout
pkgdir=$pp_wrkdir/pkg pkgdir=$pp_wrkdir/pkg
bundledir=$pp_wrkdir/pkg/$name-${version}.pkg pkgfile=$name-$version.pkg
bundledir=$pp_wrkdir/pkg/$pkgfile
Resources=$pkgdir/Resources Resources=$pkgdir/Resources
lprojdir=$Resources/en.lproj lprojdir=$Resources/en.lproj
mkdir $pkgdir $bundledir $Resources $lprojdir || mkdir $pkgdir $bundledir $Resources $lprojdir ||
@ -7389,7 +7390,7 @@ pp_backend_macos_flat () {
<choice id="choice0" title="$name $version"> <choice id="choice0" title="$name $version">
<pkg-ref id="${pp_macos_bundle_id}"/> <pkg-ref id="${pp_macos_bundle_id}"/>
</choice> </choice>
<pkg-ref id="${pp_macos_bundle_id}" installKBytes="$size" version="$version" auth="Root">#$name.pkg</pkg-ref> <pkg-ref id="${pp_macos_bundle_id}" installKBytes="$size" version="$version" auth="Root">#$pkgfile</pkg-ref>
</installer-script> </installer-script>
. .
@ -7504,7 +7505,7 @@ pp_backend_macos_flat () {
"10.5"*) ;; "10.5"*) ;;
*) xar_flags="$xar_flags --distribution";; *) xar_flags="$xar_flags --distribution";;
esac esac
(cd $pkgdir && /usr/bin/xar $xar_flags -cf "../$name-$version.pkg" *) (cd $pkgdir && /usr/bin/xar $xar_flags -cf "../$pkgfile" *)
echo "version=$version" > $name.uninstall echo "version=$version" > $name.uninstall
} }