build/package/mac_osx/make-diskimage@129ffea94266 (annotated)
build/package/mac_osx/make-diskimage
Sat, 03 Jan 2015 20:18:00 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Sat, 03 Jan 2015 20:18:00 +0100
- branch
- TOR_BUG_3246
- changeset 7
- 129ffea94266
- permissions
- -rwxr-xr-x
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
| michael@0 | 1 | #!/bin/sh |
| michael@0 | 2 | # This Source Code Form is subject to the terms of the Mozilla Public |
| michael@0 | 3 | # License, v. 2.0. If a copy of the MPL was not distributed with this |
| michael@0 | 4 | # file, You can obtain one at http://mozilla.org/MPL/2.0/. |
| michael@0 | 5 | |
| michael@0 | 6 | # Create a read-only disk image of the contents of a folder |
| michael@0 | 7 | # |
| michael@0 | 8 | # Usage: make-diskimage <image_file> |
| michael@0 | 9 | # <src_folder> |
| michael@0 | 10 | # <volume_name> |
| michael@0 | 11 | # <eula_resource_file> |
| michael@0 | 12 | # <.dsstore_file> |
| michael@0 | 13 | # <background_image_file> |
| michael@0 | 14 | # |
| michael@0 | 15 | # tip: use '-null-' for <eula-resource-file> if you only want to |
| michael@0 | 16 | # provide <.dsstore_file> and <background_image_file> |
| michael@0 | 17 | |
| michael@0 | 18 | DMG_PATH=$1 |
| michael@0 | 19 | SRC_FOLDER=$2 |
| michael@0 | 20 | VOLUME_NAME=$3 |
| michael@0 | 21 | |
| michael@0 | 22 | # optional arguments |
| michael@0 | 23 | EULA_RSRC=$4 |
| michael@0 | 24 | DMG_DSSTORE=$5 |
| michael@0 | 25 | DMG_BKGND_IMG=$6 |
| michael@0 | 26 | |
| michael@0 | 27 | EXTRA_ARGS= |
| michael@0 | 28 | |
| michael@0 | 29 | if test -n "$EULA_RSRC" && test "$EULA_RSRC" != "-null-" ; then |
| michael@0 | 30 | EXTRA_ARGS="--resource $EULA_RSRC" |
| michael@0 | 31 | fi |
| michael@0 | 32 | |
| michael@0 | 33 | if test -n "$DMG_DSSTORE" ; then |
| michael@0 | 34 | EXTRA_ARGS="$EXTRA_ARGS --copy $DMG_DSSTORE:/.DS_Store" |
| michael@0 | 35 | fi |
| michael@0 | 36 | |
| michael@0 | 37 | if test -n "$DMG_BKGND_IMG" ; then |
| michael@0 | 38 | EXTRA_ARGS="$EXTRA_ARGS --mkdir /.background --copy $DMG_BKGND_IMG:/.background" |
| michael@0 | 39 | fi |
| michael@0 | 40 | |
| michael@0 | 41 | echo `dirname $0`/pkg-dmg --target "$DMG_PATH" --source "$SRC_FOLDER" \ |
| michael@0 | 42 | --volname "$VOLUME_NAME" $EXTRA_ARGS |
| michael@0 | 43 | |
| michael@0 | 44 | `dirname $0`/pkg-dmg --target "$DMG_PATH" --source "$SRC_FOLDER" \ |
| michael@0 | 45 | --volname "$VOLUME_NAME" $EXTRA_ARGS |
| michael@0 | 46 | |
| michael@0 | 47 | exit $? |
