Attachment #15812 for bug #49907

View | Details | Raw Unified | Return to bug 49907
Collapse All | Expand All

Lines 12-17 if [ -f "$metadir"/install-scripts.tar ]; then Link Here

(-)a/installer/initinstall.d/27-metadata-install-scripts.sh (+4 lines)
12	tar -C "$metadir"/install-scripts -xvf "$metadir"/install-scripts.tar	12	tar -C "$metadir"/install-scripts -xvf "$metadir"/install-scripts.tar
13	fi	13	fi
14		14
		15	[ -d "$metadir"/install-scripts/initinstall.d/ ] &&
		16	find "$metadir"/install-scripts/initinstall.d/ -mindepth 1 -maxdepth 1 -type f -perm -u=x \
		17	-exec cp -av {} "/usr/share/install2/initinstall.d/" \;
		18
15	[ -d "$metadir"/install-scripts/preinstall.d/ ] &&	19	[ -d "$metadir"/install-scripts/preinstall.d/ ] &&
16	find "$metadir"/install-scripts/preinstall.d/ -mindepth 1 -maxdepth 1 -type f -perm -u=x \	20	find "$metadir"/install-scripts/preinstall.d/ -mindepth 1 -maxdepth 1 -type f -perm -u=x \
17	-exec cp -av {} "/usr/share/install2/preinstall.d/" \;	21	-exec cp -av {} "/usr/share/install2/preinstall.d/" \;




PLYMOUTH=/bin/plymouth

# Run initinstall scripts
for step in pre main; do
	for f in "$initinstall_dir"/*; do
		[ -f "$f" -a -x "$f" ] || continue

		fnum="${f##*/}"
		fnum="${fnum%%-*}"
		[ -n "${fnum##*[!0-9]*}" ] &&
			[ "$fnum" -ge 0 ] 2>/dev/null &&
			[ "$fnum" -lt 30 ] 2>/dev/null || fnum=
		[ -n "$fnum" ] && [ "$step" = pre ] ||
		[ -z "$fnum" ] && [ "$step" = main ] || continue

		action "Running initinstall script [${f##*/}]" "$f" ||:
		if [ -x "$PLYMOUTH" ]; then
			$PLYMOUTH --update "$f" ||:
		fi
	done
done
   whitespace

Lines 5-15 WITH_ACTION=1 Link Here

(-)a/installer/scripts/initinstall (-7 / +7 lines)
5	PLYMOUTH=/bin/plymouth	5	PLYMOUTH=/bin/plymouth
6		6
7	# Run initinstall scripts	7	# Run initinstall scripts
8	for f in "$initinstall_dir"/*; do	8	for f in "$initinstall_dir"/*; do
9	[ -f "$f" -a -x "$f" ] \|\| continue	9	[ -f "$f" -a -x "$f" ] \|\| continue
10		10
11	action "Running initinstall script [${f##*/}]" "$f" \|\|:	11	action "Running initinstall script [${f##*/}]" "$f" \|\|:
12	if [ -x "$PLYMOUTH" ]; then	12	if [ -x "$PLYMOUTH" ]; then
13	$PLYMOUTH --update "$f" \|\|:	13	$PLYMOUTH --update "$f" \|\|:
14	fi	14	fi
15	done	15	done

Return to bug 49907

Lines 5-15 WITH_ACTION=1 Link Here

(-)a/installer/scripts/initinstall (+10 lines)
5	PLYMOUTH=/bin/plymouth	5	PLYMOUTH=/bin/plymouth
6		6
7	# Run initinstall scripts	7	# Run initinstall scripts
		8	for step in pre main; do
8	for f in "$initinstall_dir"/*; do	9	for f in "$initinstall_dir"/*; do
9	[ -f "$f" -a -x "$f" ] \|\| continue	10	[ -f "$f" -a -x "$f" ] \|\| continue
10		11
		12	fnum="${f##*/}"
		13	fnum="${fnum%%-*}"
		14	[ -n "${fnum##[!0-9]}" ] &&
		15	[ "$fnum" -ge 0 ] 2>/dev/null &&
		16	[ "$fnum" -lt 30 ] 2>/dev/null \|\| fnum=
		17	[ -n "$fnum" ] && [ "$step" = pre ] \|\|
		18	[ -z "$fnum" ] && [ "$step" = main ] \|\| continue
		19
11	action "Running initinstall script [${f##*/}]" "$f" \|\|:	20	action "Running initinstall script [${f##*/}]" "$f" \|\|:
12	if [ -x "$PLYMOUTH" ]; then	21	if [ -x "$PLYMOUTH" ]; then
13	$PLYMOUTH --update "$f" \|\|:	22	$PLYMOUTH --update "$f" \|\|:
14	fi	23	fi
15	done	24	done
		25	done
16	whitespace	26	whitespace