build/package/mac_osx/make-diskimage@129ffea94266
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.
1 #!/bin/sh
2 # This Source Code Form is subject to the terms of the Mozilla Public
3 # License, v. 2.0. If a copy of the MPL was not distributed with this
4 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
6 # Create a read-only disk image of the contents of a folder
7 #
8 # Usage: make-diskimage <image_file>
9 # <src_folder>
10 # <volume_name>
11 # <eula_resource_file>
12 # <.dsstore_file>
13 # <background_image_file>
14 #
15 # tip: use '-null-' for <eula-resource-file> if you only want to
16 # provide <.dsstore_file> and <background_image_file>
18 DMG_PATH=$1
19 SRC_FOLDER=$2
20 VOLUME_NAME=$3
22 # optional arguments
23 EULA_RSRC=$4
24 DMG_DSSTORE=$5
25 DMG_BKGND_IMG=$6
27 EXTRA_ARGS=
29 if test -n "$EULA_RSRC" && test "$EULA_RSRC" != "-null-" ; then
30 EXTRA_ARGS="--resource $EULA_RSRC"
31 fi
33 if test -n "$DMG_DSSTORE" ; then
34 EXTRA_ARGS="$EXTRA_ARGS --copy $DMG_DSSTORE:/.DS_Store"
35 fi
37 if test -n "$DMG_BKGND_IMG" ; then
38 EXTRA_ARGS="$EXTRA_ARGS --mkdir /.background --copy $DMG_BKGND_IMG:/.background"
39 fi
41 echo `dirname $0`/pkg-dmg --target "$DMG_PATH" --source "$SRC_FOLDER" \
42 --volname "$VOLUME_NAME" $EXTRA_ARGS
44 `dirname $0`/pkg-dmg --target "$DMG_PATH" --source "$SRC_FOLDER" \
45 --volname "$VOLUME_NAME" $EXTRA_ARGS
47 exit $?
