Attachment #98914 for bug #143798




# Released under the GNU GPL. See LICENSE for more information

# Discover ies4linux installation folder
IES4LINUX_RELPATH="$(test -L $0 && echo $(readlink $0) || echo $0)"
IES4LINUX="$(dirname $IES4LINUX_RELPATH)"
cd "$IES4LINUX"
export IES4LINUX=`pwd`

# Changes to the user's home directory, in case "$IES4LINUX" is not writable,
# because executing `wine --version` (executed, notably, in "lib/messages.sh"),
# while in a directory where the user does not have write permission,
# leads to (unimportant?) warnings.
cd "$HOME"

# Create log file
# mkdir -p "$HOME"/.ies4linux
# touch "$HOME"/.ies4linux/log

INSTALLIE2=0

# Basic imports
source "$IES4LINUX"/lib/functions.sh
source "$IES4LINUX"/lib/terminal.sh
source "$IES4LINUX"/lib/messages.sh

# Get some command-line options.
# If an option is specified on the command line, the user won't be asked for it later on.




		tmp="$tmp \"$(eval echo \${$num})\""
		num=$((num+1))
	done
	eval $tmp &> "$BASEDIR"/tmp/cabextract.log || {
		cat "$BASEDIR"/tmp/cabextract.log
		rm "$BASEDIR"/tmp/cabextract.log
		error $MSG_ERROR_CABEXTRACTING
	}
	rm "$BASEDIR"/tmp/cabextract.log
}

# Post install

		local l=$BINDIR/ie$1
		echo " ${l//\/\//\/}"
	fi
}

Lines 89-95 Link Here

(-)ies4linux-2.0.3-orig/lib/install.sh (-2 / +2 lines)
89		89
90	subsection $MSG_INSTALLING_REGISTRY	90	subsection $MSG_INSTALLING_REGISTRY
91	add_registry "$IES4LINUX"/winereg/ie6.reg	91	add_registry "$IES4LINUX"/winereg/ie6.reg
92	add_registry "$IES4LINUX"/winereg/homepage.reg	92	add_registry "$BASEDIR"/tmp/homepage.reg
93		93
94	subsection $MSG_FINALIZING	94	subsection $MSG_FINALIZING
95	wineboot	95	wineboot
Lines 236-239 Link Here
236	clean_tmp	236	clean_tmp
237		237
238	ok	238	ok
239	}	239	}

Lines 110-116 Link Here

(-)ies4linux-2.0.3-orig/lib/messages.sh (-2 / +2 lines)
110	source "$msg_file"	110	source "$msg_file"
111		111
112	# Try to convert to user system encoding	112	# Try to convert to user system encoding
113	iconv_tmpfile="$IES4LINUX"/lang/lang.sh	113	iconv_tmpfile="$BASEDIR"/tmp/lang.sh
114	if iconv --version &> /dev/null; then	114	if iconv --version &> /dev/null; then
115	iconv -f $TRANSLATION_ENCODING -t $SYSENCODING "$msg_file" > "$iconv_tmpfile" && source "$iconv_tmpfile"	115	iconv -f $TRANSLATION_ENCODING -t $SYSENCODING "$msg_file" > "$iconv_tmpfile" && source "$iconv_tmpfile"
116	rm -f "$iconv_tmpfile"	116	rm -f "$iconv_tmpfile"
Lines 124-130 Link Here
124	exec 0<&6	124	exec 0<&6
125		125
126	# generate homepage registry file	126	# generate homepage registry file
127	cat <<FIM > "$IES4LINUX"/winereg/homepage.reg	127	cat <<FIM > "$BASEDIR"/tmp/homepage.reg
128	[HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Main]	128	[HKEY_CURRENT_USER\Software\Microsoft\Internet Explorer\Main]
129	"Start Page"="${OK_URL}"	129	"Start Page"="${OK_URL}"
130	FIM	130	FIM

Return to bug 143798

Lines 59-70 Link Here

(-)ies4linux-2.0.3-orig/lib/functions.sh (-5 / +5 lines)
59	tmp="$tmp \"$(eval echo \${$num})\""	59	tmp="$tmp \"$(eval echo \${$num})\""
60	num=$((num+1))	60	num=$((num+1))
61	done	61	done
62	eval $tmp &> "$IES4LINUX"/cabextract.log \|\| {	62	eval $tmp &> "$BASEDIR"/tmp/cabextract.log \|\| {
63	cat "$IES4LINUX"/cabextract.log	63	cat "$BASEDIR"/tmp/cabextract.log
64	rm "$IES4LINUX"/cabextract.log	64	rm "$BASEDIR"/tmp/cabextract.log
65	error $MSG_ERROR_CABEXTRACTING	65	error $MSG_ERROR_CABEXTRACTING
66	}	66	}
67	rm "$IES4LINUX"/cabextract.log	67	rm "$BASEDIR"/tmp/cabextract.log
68	}	68	}
69		69
70	# Post install	70	# Post install
Lines 85-88 Link Here
85	local l=$BINDIR/ie$1	85	local l=$BINDIR/ie$1
86	echo " ${l//\/\//\/}"	86	echo " ${l//\/\//\/}"
87	fi	87	fi
88	}	88	}

Lines 7-16 Link Here

(-)ies4linux-2.0.3-orig/ies4linux (-4 / +11 lines)
7	# Released under the GNU GPL. See LICENSE for more information	7	# Released under the GNU GPL. See LICENSE for more information
8		8
9	# Discover ies4linux installation folder	9	# Discover ies4linux installation folder
10	IES4LINUX=`dirname "$0"`	10	IES4LINUX_RELPATH="$(test -L $0 && echo $(readlink $0) \|\| echo $0)"
		11	IES4LINUX="$(dirname $IES4LINUX_RELPATH)"
11	cd "$IES4LINUX"	12	cd "$IES4LINUX"
12	export IES4LINUX=`pwd`	13	export IES4LINUX=`pwd`
13		14
		15	# Changes to the user's home directory, in case "$IES4LINUX" is not writable,
		16	# because executing `wine --version` (executed, notably, in "lib/messages.sh"),
		17	# while in a directory where the user does not have write permission,
		18	# leads to (unimportant?) warnings.
		19	cd "$HOME"
		20
14	# Create log file	21	# Create log file
15	# mkdir -p "$HOME"/.ies4linux	22	# mkdir -p "$HOME"/.ies4linux
16	# touch "$HOME"/.ies4linux/log	23	# touch "$HOME"/.ies4linux/log
Lines 40-48 Link Here
40	INSTALLIE2=0	47	INSTALLIE2=0
41		48
42	# Basic imports	49	# Basic imports
43	source lib/functions.sh	50	source "$IES4LINUX"/lib/functions.sh
44	source lib/terminal.sh	51	source "$IES4LINUX"/lib/terminal.sh
45	source lib/messages.sh	52	source "$IES4LINUX"/lib/messages.sh
46		53
47	# Get some command-line options.	54	# Get some command-line options.
48	# If an option is specified on the command line, the user won't be asked for it later on.	55	# If an option is specified on the command line, the user won't be asked for it later on.