Skip to content

Commit 851195d

Browse files
committed
unify whitespace and style for scripts
1 parent 58ad1d0 commit 851195d

File tree

4 files changed

+31
-37
lines changed

4 files changed

+31
-37
lines changed

appveyor.sh

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -26,25 +26,25 @@ exec 0</dev/null
2626
export LANG=en_US.UTF-8
2727

2828
case $1 in
29-
before_build)
30-
# This repo was checked out with Windows Git, repair it for Cygwin.
31-
eeval git config --local core.symlinks true
32-
eeval git clean --force --quiet -x -d
33-
eeval git reset --hard
34-
;;
35-
build_script)
36-
eeval ./autogen.sh
37-
eeval ./configure --enable-compile-warnings=error --enable-examples
38-
eeval make distcheck VERBOSE=1 V=1
39-
;;
40-
wait)
41-
touch wait.lck
42-
while [ -f wait.lck ]; do
43-
sleep 10
44-
done
45-
;;
46-
*)
47-
echo "Fail: $0 $*"
48-
exit 2
49-
;;
29+
before_build)
30+
# This repo was checked out with Windows Git, repair it for Cygwin.
31+
eeval git config --local core.symlinks true
32+
eeval git clean --force --quiet -x -d
33+
eeval git reset --hard
34+
;;
35+
build_script)
36+
eeval ./autogen.sh
37+
eeval ./configure --enable-compile-warnings=error --enable-examples
38+
eeval make distcheck VERBOSE=1 V=1
39+
;;
40+
wait)
41+
touch wait.lck
42+
while [ -f wait.lck ]; do
43+
sleep 10
44+
done
45+
;;
46+
*)
47+
echo "Fail: $0 $*"
48+
exit 2
49+
;;
5050
esac

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ init:
2929
- git config --global core.autocrlf input
3030
#
3131
# Install needed build dependencies
32-
#
32+
#
3333
install:
3434
- '%CYG_ROOT%\setup-x86_64.exe --quiet-mode --no-shortcuts --upgrade-also --packages autoconf,autogen,automake,cygwin-devel,git,gcc-core,gcc-g++,libncurses-devel,libprotobuf-devel,libssl-devel,make,openssh,perl,perl_pods,pkg-config,tmux,zlib-devel'
3535
- '%CYG_ROOT%\bin\cygcheck -dc'
@@ -47,7 +47,7 @@ build_script:
4747
- '%CYG_BASH% -lc "cd $APPVEYOR_BUILD_FOLDER && ./appveyor.sh build_script"'
4848
#
4949
# Disable tests for now
50-
#
50+
#
5151
test: off
5252

5353
# on_finish:

conf/bash-completion/completions/mosh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ __mosh_init_completion()
1010
fi
1111
}
1212

13-
_mosh () {
13+
_mosh() {
1414
local cur
1515

1616
__mosh_init_completion || return
1717

1818
local simple_flags="-a -b -4 -6 -p"
19-
local flags="--client= --server= --predict= --family= --port=
19+
local flags="--client= --server= --predict= --family= --port=
2020
--bind-server= --ssh= --no-init --help --version"
2121

2222
if [[ "$cur" == --* && "$COMP_CWORD" == 1 ]]; then

macosx/build.sh

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ fi
3131
3232
echo "Building into prefix..."
3333
34-
3534
#
3635
# XXX This script abuses Configure's --prefix argument badly. It uses
3736
# it as a $DESTDIR, but --prefix can also affect paths in generated
@@ -43,8 +42,7 @@ ARCHS=" ppc ppc64 i386 x86_64"
4342
4443
pushd .. > /dev/null
4544
46-
if [ ! -f configure ];
47-
then
45+
if [ ! -f configure ]; then
4846
echo "Running autogen."
4947
PATH=/opt/local/bin:$PATH ./autogen.sh
5048
fi
@@ -77,7 +75,6 @@ fi
7775
7876
echo "Building universal binaries for archs ${BUILT_ARCHS}..."
7977
80-
8178
rm -rf "$PREFIX"
8279
# Copy one architecture to get all files into place.
8380
for arch in $BUILT_ARCHS; do
@@ -90,7 +87,7 @@ done
9087
for prog in local/bin/mosh-client local/bin/mosh-server; do
9188
archprogs=()
9289
for arch in $BUILT_ARCHS; do
93-
archprogs+=("${PREFIX}_${arch}/$prog")
90+
archprogs+=("${PREFIX}_${arch}/$prog")
9491
done
9592
lipo -create "${archprogs[@]}" -output "${PREFIX}/$prog"
9693
done
@@ -113,7 +110,7 @@ if which -s pkgbuild; then
113110
echo "Preprocessing package description..."
114111
PKGID=edu.mit.mosh.mosh.pkg
115112
for file in Distribution; do
116-
sed -e "s/@PACKAGE_VERSION@/${PACKAGE_VERSION}/g" ${file}.in > ${file}
113+
sed -e "s/@PACKAGE_VERSION@/${PACKAGE_VERSION}/g" ${file}.in > ${file}
117114
done
118115
echo "Running pkgbuild/productbuild..."
119116
mkdir -p Resources/en.lproj
@@ -132,9 +129,8 @@ else
132129
OUTDIR=mosh-package.pmdoc
133130
mkdir -p "$OUTDIR"
134131
pushd "$INDIR" > /dev/null
135-
for file in *
136-
do
137-
sed -e 's/$PACKAGE_VERSION/'"$PACKAGE_VERSION"'/g' "$file" > "../$OUTDIR/$file"
132+
for file in *; do
133+
sed -e 's/$PACKAGE_VERSION/'"$PACKAGE_VERSION"'/g' "$file" > "../$OUTDIR/$file"
138134
done
139135
popd > /dev/null
140136
echo "Running PackageMaker..."
@@ -143,9 +139,7 @@ else
143139
rm -rf "$OUTDIR"
144140
fi
145141
146-
147-
if [ -f "$OUTFILE" ];
148-
then
142+
if [ -f "$OUTFILE" ]; then
149143
echo "Successfully built $OUTFILE with archs ${BUILT_ARCHS}."
150144
else
151145
echo "There was an error building $OUTFILE."

0 commit comments

Comments
 (0)