mirror of
https://github.com/RasppleII/a2cloud.git
synced 2024-11-23 07:34:38 +00:00
Re-indent the scripts a bit to match expectations
Notably this may cause issues diffing adtpro.sh.txt against the upstreadm adtpro.sh script. Ours had mixed coding styles, and I figured having to diff with whitespace ignored was a better solution than dealing with mixed styles either in the file or in the tree for the majority of people who aren't likely using the same editor I am.
This commit is contained in:
parent
cf4bc9ea92
commit
c2deff81ae
@ -30,7 +30,10 @@ echo $nickname > ~/.irssi/a2c.nickname
|
||||
if [[ -f ~/.irssi/startup ]]; then
|
||||
mv ~/.irssi/startup ~/.irssi/startup.orig
|
||||
fi
|
||||
echo -e "/network add -autosendcmd '/join #a2c.chat' Palomino.A2\n/server add -auto -network Palomino.A2 irc.a2central.com\n" > ~/.irssi/startup
|
||||
# SOME broken versions of bash have an intentionally broken
|
||||
# echo -e for no justifiable reason. Yes I mean YOU, Apple!
|
||||
echo "/network add -autosendcmd '/join #a2c.chat' Palomino.A2
|
||||
/server add -auto -network Palomino.A2 irc.a2central.com\n" > ~/.irssi/startup
|
||||
|
||||
if [[ -f ~/.irssi/config ]]; then
|
||||
cp ~/.irssi/config ~/.irssi/config.orig
|
||||
|
@ -9,7 +9,7 @@ decToHex () {
|
||||
[[ $arg1 ]] || return 11
|
||||
[[ $2 ]] && return 8
|
||||
[[ ( $(printf %d "$arg1" 2> /dev/null) == $arg1 ) \
|
||||
&& ( $arg1 -ge 0 ) && ( $arg1 -le 255 ) ]] || return 21
|
||||
&& ( $arg1 -ge 0 ) && ( $arg1 -le 255 ) ]] || return 21
|
||||
# args are valid
|
||||
printf %02X "$arg1"
|
||||
}
|
||||
|
@ -99,16 +99,16 @@ fi
|
||||
|
||||
# For OSX, use this:
|
||||
if [ "$OS" = "Darwin" ]; then
|
||||
if [ "$OS_ARCH" = "powerpc" ]; then
|
||||
export RXTXLIB=lib/rxtx/rxtx-2.1-7-bins-r2/Mac_OS_X
|
||||
else
|
||||
export RXTXLIB=lib/rxtx/rxtx-2.2pre2-local/mac-10.5
|
||||
fi
|
||||
if [ "$OS_ARCH" = "powerpc" ]; then
|
||||
export RXTXLIB=lib/rxtx/rxtx-2.1-7-bins-r2/Mac_OS_X
|
||||
else
|
||||
export RXTXLIB=lib/rxtx/rxtx-2.2pre2-local/mac-10.5
|
||||
fi
|
||||
fi
|
||||
|
||||
# For Solaris, use this:
|
||||
if [ "$OS" = "SunOS" ]; then
|
||||
export RXTXLIB=lib/rxtx/rxtx-2.2pre2-local/sparc-sun-solaris2.10-32
|
||||
export RXTXLIB=lib/rxtx/rxtx-2.2pre2-local/sparc-sun-solaris2.10-32
|
||||
fi
|
||||
|
||||
# Set up the library location.
|
||||
@ -116,18 +116,18 @@ export TWEAK1="-Djava.library.path="
|
||||
export TWEAK=$TWEAK1$ADTPRO_HOME/$RXTXLIB
|
||||
|
||||
if [[ $headless ]]; then
|
||||
if [[ ! $1 || ! -f /usr/bin/xvfb-run ]]; then
|
||||
if [[ ! -f /usr/bin/xvfb-run ]]; then
|
||||
echo "Headless operation requires xvfb."
|
||||
usageExit
|
||||
if [[ ! $1 || ! -f /usr/bin/xvfb-run ]]; then
|
||||
if [[ ! -f /usr/bin/xvfb-run ]]; then
|
||||
echo "Headless operation requires xvfb."
|
||||
usageExit
|
||||
else
|
||||
echo "Headless operation requires a communication mode (e.g. serial)."
|
||||
usageExit
|
||||
fi
|
||||
exit 1
|
||||
else
|
||||
echo "Headless operation requires a communication mode (e.g. serial)."
|
||||
usageExit
|
||||
HEADLESS="xvfb-run --auto-servernum "
|
||||
fi
|
||||
exit 1
|
||||
else
|
||||
HEADLESS="xvfb-run --auto-servernum "
|
||||
fi
|
||||
fi
|
||||
|
||||
if [[ $serialPortName && $(ps aux | grep "/sbin/getty.*$serialPortName") ]]; then
|
||||
|
@ -881,4 +881,3 @@ else:
|
||||
processDir(2)
|
||||
if not g.DIR:
|
||||
syncExit()
|
||||
|
||||
|
@ -52,6 +52,7 @@ else
|
||||
if [[ $REPLY == "ok" || $REPLY == "ok" || $REPLY == "Ok" ]]; then
|
||||
sudo touch /usr/local/etc/gsportconsolewarningoff
|
||||
fi
|
||||
# FIXME: Should this block just be deleted at this point?
|
||||
# echo "If you wish to run GSport in the console window, the mouse will not work"
|
||||
# echo "unless you uninstall VirtualBox Guest Additions. If you don't want to do"
|
||||
# echo "this, you can instead run GSport in an X window (e.g. by typing 'startx')."
|
||||
|
@ -45,11 +45,11 @@ done
|
||||
noobs=
|
||||
readarray -t partitions < <(sudo fdisk -l | grep '^/dev')
|
||||
if [[ \
|
||||
${partitions[0]:0:14} == "/dev/mmcblk0p1" && ${partitions[0]:57:2} == " e" &&
|
||||
${partitions[1]:0:14} == "/dev/mmcblk0p2" && ${partitions[1]:57:2} == "85" &&
|
||||
${partitions[2]:0:14} == "/dev/mmcblk0p3" && ${partitions[2]:57:2} == "83" &&
|
||||
${partitions[3]:0:14} == "/dev/mmcblk0p5" && ${partitions[3]:57:2} == " c" &&
|
||||
${partitions[4]:0:14} == "/dev/mmcblk0p6" && ${partitions[4]:57:2} == "83" ]]; then
|
||||
${partitions[0]:0:14} == "/dev/mmcblk0p1" && ${partitions[0]:57:2} == " e" &&
|
||||
${partitions[1]:0:14} == "/dev/mmcblk0p2" && ${partitions[1]:57:2} == "85" &&
|
||||
${partitions[2]:0:14} == "/dev/mmcblk0p3" && ${partitions[2]:57:2} == "83" &&
|
||||
${partitions[3]:0:14} == "/dev/mmcblk0p5" && ${partitions[3]:57:2} == " c" &&
|
||||
${partitions[4]:0:14} == "/dev/mmcblk0p6" && ${partitions[4]:57:2} == "83" ]]; then
|
||||
noobs=" and the NOOBS install manager"
|
||||
fi
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user