Compare text

Find the difference between two text files

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

Tools

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

CHA

Created 5 years agoDiff never expires

Lines
Total
Removed

Words
Total
Removed

To continue using this feature, upgrade to Diffchecker Pro View Pricing

116 lines

Lines
Total
Added

Words
Total
Added

To continue using this feature, upgrade to Diffchecker Pro View Pricing

#! /bin/sh

export clr_red="\e[0;31m"

export clr_grn="\e[0;32m"

export clr_choko="\e[0;35m"

export clr_std="\e[m"

FAILED=0

echo -e $clr_grn

case $1 in

start)

TERM=linux setterm --cursor on --blink off >/dev/tty0 </dev/tty0

echo 1 >/sys/class/graphics/fbcon/cursor_blink

echo Running $0 $@

MOUNTCMD='mount --bind ./$DIR /$DIR'

if [ ! -e ./first_boot_completed ]

then

echo "Initial setup"

for DIR in \

opt/capcom \

usr/share/roms

if [ $FAILED -eq 0 ]

then

echo -n "Copying /$DIR: "

if [ -d /$DIR ]

then

COPYCMD='cp -ru /$DIR ./$DIR/..'

else

COPYCMD='cp -u /$DIR ./$DIR'

eval "CMD=\"$COPYCMD\""

echo "(" $CMD ")"

$CMD

if [ $? -eq 0 ]

then

echo "SUCCEEDED"

else

echo -e "${clr_red}FAILED${clr_grn}"

FAILED=1

sync

done

if [ $FAILED -eq 1 ]

then

echo -e "${clr_red}Initial setup failed. Not applying CHA_MOD${clr_grn}"

else

echo "Creating 'first_boot_completed' file"

touch ./first_boot_completed

# Reboot after copying for system stabilty reasons

sync

reboot -f

# If /dev/ttyS0 is not used then start a getty login shell on it

# if [ ! `lsof | grep -e ttyS0` ]

if [ ! `lsof | grep -e ttyS0` ]

# then

then

# while /bin/true

while /bin/true

# do

# setsid /sbin/getty -L /dev/ttyS0 0 vt100

setsid /sbin/getty -L /dev/ttyS0 0 vt100

# done &

done &

# fi

# # Start FTP server if it exists, even if initial setup failed

# Start FTP server if it exists, even if initial setup failed

# if [ -x ./uFTP/uFTP ]

if [ -x ./uFTP/uFTP ]

# then

then

# cd uFTP

cd uFTP

# echo "Starting uFTP"

echo "Starting uFTP"

# ./uFTP

./uFTP

# cd ..

cd ..

# fi

# Start dropbear SSH server if it exists but not if initial setup failed

# if [ -x ./sshd/dropbear -a $FAILED -eq 0 ]

if [ -x ./sshd/dropbear -a $FAILED -eq 0 ]

# then

then

# cd sshd

cd sshd

# echo "Starting dropbear SSH server"

echo "Starting dropbear SSH server"

# ./dropbear -r ./dropbear_ecdsa_host_key -r ./id_rsa -R -E -B

./dropbear -r ./dropbear_ecdsa_host_key -r ./id_rsa -R -E -B

# cd ..

cd ..

# fi

;;

stop)

MOUNTCMD='umount /$DIR'

# Kill capcom to ensure directories can be unmounted

echo "Stopping capcom, uFTP, dropbear"

until [ `ps | grep -e capcom -e uFTP -e dropbear | wc -l` -eq 1 ]

killall capcom uFTP dropbear 2>/dev/null

done

;;

MOUNTCMD="echo >/dev/null"

echo "usage: $0 [start|stop]"

;;

esac

# 'Overmount' the various games-related directories

# Note - No sounds/music/set1

if [ $FAILED -eq 0 ]

then

for DIR in \

opt/capcom/assets/capcom-home-arcade-last.png \

opt/capcom/assets/games.txt \

opt/capcom/assets/games \

opt/capcom/assets/options \

opt/capcom/assets/sounds \

usr/share/roms \

usr/lib/libretro/fba_libretro.so

eval "CMD=\"$MOUNTCMD\""

echo $CMD

$CMD

done

sync

echo -e "${clr_std}"

Saved diffs

Original text

Open file

#! /bin/sh
export clr_red="\e[0;31m"
export clr_grn="\e[0;32m"
export clr_choko="\e[0;35m"
export clr_std="\e[m"
FAILED=0

echo -e $clr_grn

case $1 in
	start)
		TERM=linux setterm --cursor on --blink off >/dev/tty0 </dev/tty0
		echo 1 >/sys/class/graphics/fbcon/cursor_blink
		echo Running $0 $@ 
		MOUNTCMD='mount --bind ./$DIR /$DIR'
		if [ ! -e ./first_boot_completed ]
		then
			echo "Initial setup"
			for DIR in \
						opt/capcom \
						usr/share/roms
			do
				if [ $FAILED -eq 0 ]
				then
					echo -n "Copying /$DIR: "
					if [ -d /$DIR ]
					then
						COPYCMD='cp -ru /$DIR ./$DIR/..'
					else
						COPYCMD='cp -u /$DIR ./$DIR'
					fi
					eval "CMD=\"$COPYCMD\""
					echo "(" $CMD ")"
					$CMD
					if [ $? -eq 0 ]
					then
						echo "SUCCEEDED"
					else
						echo -e "${clr_red}FAILED${clr_grn}"
						FAILED=1
					fi
					sync
				fi
			done
			if [ $FAILED -eq 1 ]
			then
				echo -e "${clr_red}Initial setup failed. Not applying CHA_MOD${clr_grn}"
			else
				echo "Creating 'first_boot_completed' file"
				touch ./first_boot_completed
				# Reboot after copying for system stabilty reasons
				sync
				reboot -f
			fi
		fi
		
		# If /dev/ttyS0 is not used then start a getty login shell on it
#		if [ ! `lsof | grep -e ttyS0` ]
#		then
#			while /bin/true
#			do
#				setsid /sbin/getty -L /dev/ttyS0 0 vt100
#			done &
#		fi
#		# Start FTP server if it exists, even if initial setup failed
#		if [ -x ./uFTP/uFTP ]
#		then
#			cd uFTP
#			echo "Starting uFTP"
#			./uFTP
#			cd ..
#		fi
		# Start dropbear SSH server if it exists but not if initial setup failed
#		if [ -x ./sshd/dropbear -a $FAILED -eq 0 ]
#		then
#			cd sshd
#			echo "Starting dropbear SSH server"
#			./dropbear -r ./dropbear_ecdsa_host_key -r ./id_rsa -R -E -B
#			cd ..
#		fi
		;;
	stop)
		MOUNTCMD='umount /$DIR'
		# Kill capcom to ensure directories can be unmounted
		echo "Stopping capcom, uFTP, dropbear"
		until [ `ps | grep -e capcom -e uFTP -e dropbear | wc -l` -eq 1 ]
		do
			killall capcom uFTP dropbear 2>/dev/null
		done
		;;
	*)
		MOUNTCMD="echo >/dev/null"
		echo "usage: $0 [start|stop]"
		;;
esac

# 'Overmount' the various games-related directories
# Note - No sounds/music/set1
if [ $FAILED -eq 0 ]
then
	for DIR in \
		opt/capcom/assets/capcom-home-arcade-last.png \
		opt/capcom/assets/games.txt \
		opt/capcom/assets/games  \
		opt/capcom/assets/options \
		opt/capcom/assets/sounds \
		usr/share/roms \
		usr/lib/libretro/fba_libretro.so
	do
		eval "CMD=\"$MOUNTCMD\""
		echo $CMD
		$CMD
	done
fi
sync
echo -e "${clr_std}"

Changed text

Open file

#! /bin/sh
export clr_red="\e[0;31m"
export clr_grn="\e[0;32m"
export clr_choko="\e[0;35m"
export clr_std="\e[m"
FAILED=0

echo -e $clr_grn

case $1 in
	start)
		TERM=linux setterm --cursor on --blink off >/dev/tty0 </dev/tty0
		echo 1 >/sys/class/graphics/fbcon/cursor_blink
		echo Running $0 $@ 
		MOUNTCMD='mount --bind ./$DIR /$DIR'
		if [ ! -e ./first_boot_completed ]
		then
			echo "Initial setup"
			for DIR in \
						opt/capcom \
						usr/share/roms
			do
				if [ $FAILED -eq 0 ]
				then
					echo -n "Copying /$DIR: "
					if [ -d /$DIR ]
					then
						COPYCMD='cp -ru /$DIR ./$DIR/..'
					else
						COPYCMD='cp -u /$DIR ./$DIR'
					fi
					eval "CMD=\"$COPYCMD\""
					echo "(" $CMD ")"
					$CMD
					if [ $? -eq 0 ]
					then
						echo "SUCCEEDED"
					else
						echo -e "${clr_red}FAILED${clr_grn}"
						FAILED=1
					fi
					sync
				fi
			done
			if [ $FAILED -eq 1 ]
			then
				echo -e "${clr_red}Initial setup failed. Not applying CHA_MOD${clr_grn}"
			else
				echo "Creating 'first_boot_completed' file"
				touch ./first_boot_completed
				# Reboot after copying for system stabilty reasons
				sync
				reboot -f
			fi
		fi
		
		# If /dev/ttyS0 is not used then start a getty login shell on it
		if [ ! `lsof | grep -e ttyS0` ]
		then
			while /bin/true
			do
				setsid /sbin/getty -L /dev/ttyS0 0 vt100
			done &
		fi
		# Start FTP server if it exists, even if initial setup failed
		if [ -x ./uFTP/uFTP ]
		then
			cd uFTP
			echo "Starting uFTP"
			./uFTP
			cd ..
		fi
		# Start dropbear SSH server if it exists but not if initial setup failed
		if [ -x ./sshd/dropbear -a $FAILED -eq 0 ]
		then
			cd sshd
			echo "Starting dropbear SSH server"
			./dropbear -r ./dropbear_ecdsa_host_key -r ./id_rsa -R -E -B
			cd ..
		fi
		;;
	stop)
		MOUNTCMD='umount /$DIR'
		# Kill capcom to ensure directories can be unmounted
		echo "Stopping capcom, uFTP, dropbear"
		until [ `ps | grep -e capcom -e uFTP -e dropbear | wc -l` -eq 1 ]
		do
			killall capcom uFTP dropbear 2>/dev/null
		done
		;;
	*)
		MOUNTCMD="echo >/dev/null"
		echo "usage: $0 [start|stop]"
		;;
esac