]>
Commit | Line | Data |
---|---|---|
8793ed7f ER |
1 | --- VMware-player-3.0.0.203739/install.sh 2009-12-12 18:04:16.883512711 +0200 |
2 | +++ VMware-player-3.0.0.203739/install.sh 2009-12-12 17:57:25.533346342 +0200 | |
3 | @@ -18,7 +18,7 @@ | |
4 | fi | |
5 | ||
6 | # dash flips out of $opts is quoted, so don't. | |
7 | - exec /usr/bin/env bash $opts "$SOURCE" "$@" | |
8 | + exec /usr/bin/env bash $opts "$0" "$@" | |
9 | echo "Unable to restart with bash shell" | |
10 | exit 1 | |
11 | fi | |
12 | @@ -85,7 +85,7 @@ | |
13 | fi | |
14 | } | |
15 | ||
16 | -trap on_exit EXIT | |
17 | +#trap on_exit EXIT | |
18 | trap "" USR1 | |
19 | ||
20 | # Retrives and sets the various lengths that are extracted from the | |
21 | @@ -182,7 +182,7 @@ | |
22 | # Returns: | |
23 | # None | |
24 | extract_self() { | |
25 | - VMIS_TEMP=`mktemp -d /tmp/vmis.XXXXXX` | |
26 | + VMIS_TEMP=$(pwd) | |
27 | local file="$SOURCE" | |
28 | local filter="" | |
29 | local bootstrapper="$PREPAYLOAD"/bootstrapper-gtk | |
30 | @@ -213,7 +213,7 @@ | |
31 | } | |
32 | ||
33 | extract_prepayload() { | |
34 | - PREPAYLOAD=`mktemp -d /tmp/vmis.XXXXXX` | |
35 | + PREPAYLOAD=$(pwd) | |
36 | local file="$SOURCE" | |
37 | ||
38 | if [ ! -d "$PREPAYLOAD" ]; then | |
39 | @@ -568,6 +568,7 @@ | |
40 | esac | |
41 | fi | |
42 | ||
43 | + if [ ! -d install ]; then | |
44 | if ! set_lengths "$SOURCE"; then | |
45 | echo "Unable to extract lengths from bundle." | |
46 | exit 1 | |
47 | @@ -575,6 +576,9 @@ | |
48 | ||
49 | extract_prepayload | |
50 | extract_self | |
51 | + else | |
52 | + VMIS_TEMP=$(pwd) | |
53 | + fi | |
54 | ||
55 | install "$VMIS_TEMP" "$help" "$fullpath" "$extract" "$@" | |
56 | } |