[scripts,bash] reformat bash scripts

packaging/flatpak/build-bundle.sh

@@ -1,11 +1,10 @@
 #!/bin/bash -xe
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 
 MANIFEST=com.freerdp.FreeRDP
 
 BUILD_BASE=$(mktemp -d)
-if [ $# -gt 0 ];
+if [ $# -gt 0 ]; then
-then
   BUILD_BASE=$1
 fi
 
@@ -15,15 +14,13 @@ BUILD=$BUILD_BASE/build
 STATE=$BUILD_BASE/state
 
 BUILDER=$(which flatpak-builder)
-if [ ! -x "$BUILDER" ];
+if [ ! -x "$BUILDER" ]; then
-then
   echo "command 'flatpak-builder' could not be found, please install and add to PATH"
   exit 1
 fi
 
 FLATPAK=$(which flatpak)
-if [ ! -x "$FLATPAK" ];
+if [ ! -x "$FLATPAK" ]; then
-then
   echo "command 'flatpak' could not be found, please install and add to PATH"
   exit 1
 fi

packaging/flatpak/freerdp.sh

@@ -1,19 +1,15 @@
 #!/bin/sh
 
-if [ -z ${FREERDP_SDL_OFF} ];
+if [ -z ${FREERDP_SDL_OFF} ]; then
-then
   echo "SDL $(which sdl-freerdp)"
   sdl-freerdp $@
   exit $rc
 else
-	if [ -z $XDG_SESSION_TYPE ];
+  if [ -z $XDG_SESSION_TYPE ]; then
-	then
     echo "XDG_SESSION_TYPE undefined"
     exit -1
-	elif [ "$XDG_SESSION_TYPE" = "wayland" ];
+  elif [ "$XDG_SESSION_TYPE" = "wayland" ]; then
-	then
+    if [ -z $FREERDP_WAYLAND_OFF ]; then
-		if [ -z $FREERDP_WAYLAND_OFF ];
-		then
       echo "wayland $(which wlfreerdp)"
       wlfreerdp $@
       exit $rc
@@ -22,8 +18,7 @@ else
       xfreerdp $@
       exit $rc
     fi
-	elif [ "$XDG_SESSION_TYPE" = "x11" ];
+  elif [ "$XDG_SESSION_TYPE" = "x11" ]; then
-	then
     echo "X11 $(which xfreerdp)"
     xfreerdp $@
     exit $rc

packaging/scripts/create_deb.sh

@@ -6,8 +6,7 @@ SCRIPT_PATH=$(realpath "$SCRIPT_PATH")
 BUILD_DEPS=$(/usr/bin/which dpkg-checkbuilddeps)
 BUILD_PKG=$(/usr/bin/which dpkg-buildpackage)
 
-if [ -z "$BUILD_DEPS" ] || [ -z "$BUILD_PKG" ];
+if [ -z "$BUILD_DEPS" ] || [ -z "$BUILD_PKG" ]; then
-then
   echo "dpkg-buildpackage [$BUILD_PKG] and dpkg-checkbuilddeps [$BUILD_DEPS] required"
   echo "Install with 'sudo apt install dpkg-dev'"
   exit 1

packaging/scripts/prepare_deb_freerdp-nightly.sh

@@ -1,4 +1,4 @@
 #!/bin/sh
 
 ln -s packaging/deb/freerdp-nightly debian
-git rev-parse --short HEAD > .source_version
+git rev-parse --short HEAD >.source_version

packaging/scripts/prepare_rpm_freerdp-nightly.sh

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-git rev-parse --short HEAD > source_version
+git rev-parse --short HEAD >source_version

scripts/android-build-cjson.sh

@@ -22,8 +22,7 @@ CMAKE_CMD_ARGS="-DANDROID_NDK=$ANDROID_NDK \
 	-DCMAKE_MAKE_PROGRAM=make"
 
 BASE=$(pwd)
-for ARCH in $BUILD_ARCH
+for ARCH in $BUILD_ARCH; do
-do
   common_run cd $BASE
   common_run mkdir -p $BUILD_SRC/cJSON-build/$ARCH
   common_run cd $BUILD_SRC/cJSON-build/$ARCH

scripts/android-build-common.sh

@@ -1,16 +1,17 @@
 #!/bin/bash -x
 
+SCRIPT_NAME="${BASH_SOURCE[0]}"
 SCRIPT_PATH=$(dirname "${BASH_SOURCE[0]}")
 SCRIPT_PATH=$(realpath "$SCRIPT_PATH")
 
 FIND_ARGS="-type f -print -quit"
 case "$(uname -s)" in
 
-   Darwin)
+Darwin)
   FIND_ARGS="-perm +111 $FIND_ARGS"
   ;;
 
-   *)
+*)
   FIND_ARGS="-executable $FIND_ARGS"
   ;;
 esac
@@ -62,7 +63,7 @@ fi
 CLEAN_BUILD_DIR=0
 
 function common_help {
-	echo "$(BASHSOURCE[0]) supports the following arguments:"
+  echo "$SCRIPT_NAME supports the following arguments:"
   echo "	--ndk	The base directory of your android NDK defa"
   echo "			ANDROID_NDK=$ANDROID_NDK"
   echo "	--sdk	The base directory of your android SDK defa"
@@ -88,57 +89,48 @@ function common_run {
   echo "[RUN] $@"
   "$@"
   RES=$?
-	if [[ $RES -ne 0 ]];
+  if [[ $RES -ne 0 ]]; then
-	then
     echo "[ERROR] $@ returned $RES"
     exit 1
   fi
 }
 
 function common_check_requirements {
-	if [[ ! -d $ANDROID_NDK ]];
+  if [[ ! -d $ANDROID_NDK ]]; then
-	then
     echo "export ANDROID_NDK to point to your NDK location."
     exit 1
   fi
 
-	if [[ ! -d $ANDROID_SDK ]];
+  if [[ ! -d $ANDROID_SDK ]]; then
-	then
     echo "export ANDROID_SDK to point to your SDK location."
     exit 1
   fi
-	if [[ -z $BUILD_DST ]];
+  if [[ -z $BUILD_DST ]]; then
-	then
     echo "Destination directory not valid"
     exit 1
   fi
 
-	if [[ -z $BUILD_SRC ]];
+  if [[ -z $BUILD_SRC ]]; then
-	then
     echo "Source directory not valid"
     exit 1
   fi
 
-	if [[ -z $SCM_URL ]];
+  if [[ -z $SCM_URL ]]; then
-	then
     echo "Source URL not defined! Define SCM_URL"
     exit 1
   fi
 
-	if [[ -z $SCM_TAG ]];
+  if [[ -z $SCM_TAG ]]; then
-	then
     echo "SCM_TAG / BRANCH not defined! Define SCM_TAG"
     exit 1
   fi
 
-	if [[ -z $SCM_HASH ]];
+  if [[ -z $SCM_HASH ]]; then
-	then
     echo "SCM_HASH not defined! Define SCM_HASH"
     exit 1
   fi
 
-	if [[ -z $NDK_TARGET ]];
+  if [[ -z $NDK_TARGET ]]; then
-	then
     echo "Android platform NDK_TARGET not defined"
     exit 1
   fi
@@ -151,27 +143,23 @@ function common_check_requirements {
     fi
   fi
 
-	for CMD in make git $CMAKE_PROGRAM
+  for CMD in make git $CMAKE_PROGRAM; do
-	do
     if ! type $CMD >/dev/null; then
       echo "Command $CMD not found. Install and add it to the PATH."
       exit 1
     fi
   done
 
-	if [ "${BUILD_SRC:0:1}" != "/" ];
+  if [ "${BUILD_SRC:0:1}" != "/" ]; then
-	then
     BUILD_SRC=$(pwd)/$BUILD_SRC
   fi
-	if [ "${BUILD_DST:0:1}" != "/" ];
+  if [ "${BUILD_DST:0:1}" != "/" ]; then
-	then
     BUILD_DST=$(pwd)/$BUILD_DST
   fi
 }
 
 function common_parse_arguments {
-	while [[ $# > 0 ]]
+  while [[ $# > 0 ]]; do
-	do
     key="$1"
     case $key in
     --conf)
@@ -244,8 +232,7 @@ function common_parse_arguments {
 }
 
 function common_update {
-	if [ $# -ne 4 ];
+  if [ $# -ne 4 ]; then
-	then
     echo "Invalid arguments to update function $@"
     exit 1
   fi
@@ -260,15 +247,12 @@ function common_update {
   common_run mkdir -p $CACHE
   TARFILE="$CACHE/$SCM_TAG.tar.gz"
 
-	if [[ ! -f "$TARFILE" ]];
+  if [[ ! -f "$TARFILE" ]]; then
-	then
     WGET=$(which wget)
     CURL=$(which curl)
-		if [ -x "$CURL" ];
+    if [ -x "$CURL" ]; then
-		then
       common_run $CURL -L -o "$TARFILE" "$SCM_URL/$SCM_TAG.tar.gz"
-		elif [ -x "$WGET" ];
+    elif [ -x "$WGET" ]; then
-		then
       common_run $WGET -O "$TARFILE" "$SCM_URL/$SCM_TAG.tar.gz"
     else
       echo "Neither wget nor curl installed, aborting"
@@ -276,11 +260,10 @@ function common_update {
     fi
   fi
 
-	echo "$SCM_HASH $TARFILE" > $TARFILE.sha256sum
+  echo "$SCM_HASH $TARFILE" >$TARFILE.sha256sum
   common_run sha256sum -c $TARFILE.sha256sum
 
-	if [[ -d $BUILD_SRC ]];
+  if [[ -d $BUILD_SRC ]]; then
-	then
     common_run rm -rf $BUILD_SRC
   fi
   common_run mkdir -p $BUILD_SRC
@@ -291,13 +274,11 @@ function common_update {
 }
 
 function common_clean {
-	if [ $CLEAN_BUILD_DIR -ne 1 ];
+  if [ $CLEAN_BUILD_DIR -ne 1 ]; then
-	then
     return
   fi
 
-	if [ $# -ne 1 ];
+  if [ $# -ne 1 ]; then
-	then
     echo "Invalid arguments to clean function $@"
     exit 1
   fi
@@ -307,24 +288,20 @@ function common_clean {
 }
 
 function common_copy {
-	if [ $# -ne 2 ];
+  if [ $# -ne 2 ]; then
-	then
     echo "Invalid arguments to copy function $@"
     exit 1
   fi
-	if [ ! -d $1 ] || [ ! -d $1/include ] || [ ! -d $1/libs ];
+  if [ ! -d $1 ] || [ ! -d $1/include ] || [ ! -d $1/libs ]; then
-	then
     echo "Invalid source $1"
     exit 1
   fi
-	if [ -z $2 ];
+  if [ -z $2 ]; then
-	then
     echo "Invalid destination $2"
     exit 1
   fi
 
-	if [ ! -d $2 ];
+  if [ ! -d $2 ]; then
-	then
     common_run mkdir -p $2
   fi
   common_run cp -L -r $1/include $2

scripts/android-build-ffmpeg.sh

@@ -10,16 +10,16 @@ source $(dirname "${BASH_SOURCE[0]}")/android-build-common.sh
 function get_toolchain() {
   HOST_OS=$(uname -s)
   case ${HOST_OS} in
-        Darwin) HOST_OS=darwin;;
+  Darwin) HOST_OS=darwin ;;
-        Linux) HOST_OS=linux;;
+  Linux) HOST_OS=linux ;;
-        FreeBsd) HOST_OS=freebsd;;
+  FreeBsd) HOST_OS=freebsd ;;
-        CYGWIN*|*_NT-*) HOST_OS=cygwin;;
+  CYGWIN* | *_NT-*) HOST_OS=cygwin ;;
   esac
 
   HOST_ARCH=$(uname -m)
   case ${HOST_ARCH} in
-        i?86) HOST_ARCH=x86;;
+  i?86) HOST_ARCH=x86 ;;
-        x86_64|amd64) HOST_ARCH=x86_64;;
+  x86_64 | amd64) HOST_ARCH=x86_64 ;;
   esac
 
   echo "${HOST_OS}-${HOST_ARCH}"
@@ -178,15 +178,13 @@ function build {
 common_parse_arguments $@
 common_update $SCM_URL $SCM_TAG $BUILD_SRC $SCM_HASH
 
-HOST_PKG_CONFIG_PATH=`command -v pkg-config`
+HOST_PKG_CONFIG_PATH=$(command -v pkg-config)
 if [ -z ${HOST_PKG_CONFIG_PATH} ]; then
   echo "(*) pkg-config command not found\n"
   exit 1
 fi
 
-
+for ARCH in $BUILD_ARCH; do
-for ARCH in $BUILD_ARCH
-do
   case ${ARCH} in
   armeabi-v7a)
     TARGET_CPU="armv7-a"

scripts/android-build-freerdp.sh

@@ -28,8 +28,7 @@ source $SCRIPT_PATH/android-build.conf
 
 # Parse arguments.
 REMAINING=""
-while [[ $# > 0 ]]
+while [[ $# > 0 ]]; do
-do
   key="$1"
   case $key in
   --freerdp-src)
@@ -81,20 +80,17 @@ do
 done
 common_parse_arguments $REMAINING
 
-if [ -z ${WITH_MEDIACODEC+x} ];
+if [ -z ${WITH_MEDIACODEC+x} ]; then
-then
   common_run echo "WITH_MEDIACODEC unset, defining WITH_MEDIACODEC=1"
   WITH_MEDIACODEC=1
 fi
 
 # clean up top
-if [ -d $BUILD_SRC ];
+if [ -d $BUILD_SRC ]; then
-then
   common_clean $BUILD_SRC
 fi
 
-if [ -d $BUILD_DST ];
+if [ -d $BUILD_DST ]; then
-then
   common_run mkdir -p $BUILD_DST
 fi
 
@@ -115,20 +111,16 @@ CMAKE_CMD_ARGS="-DANDROID_NDK=$ANDROID_NDK \
 	-DCMAKE_MAKE_PROGRAM=make"
 
 BASE=$(pwd)
-for ARCH in $BUILD_ARCH
+for ARCH in $BUILD_ARCH; do
-do
   # build dependencies.
-	if [ $WITH_OPENH264 -ne 0 ];
+  if [ $WITH_OPENH264 -ne 0 ]; then
-	then
+    if [ -z "$ANDROID_NDK_OPENH264" ]; then
-		if [ -z "$ANDROID_NDK_OPENH264" ]
-		then
       echo
       echo "Warning: Missing openh264-ndk, using $ANDROID_NDK" >&2
       echo
       ANDROID_NDK_OPENH264=$ANDROID_NDK
     fi
-		if [ $BUILD_DEPS -ne 0 ];
+    if [ $BUILD_DEPS -ne 0 ]; then
-		then
       common_run bash $SCRIPT_PATH/android-build-openh264.sh \
         --src $BUILD_SRC/openh264 --dst $BUILD_DST \
         --sdk "$ANDROID_SDK" \
@@ -143,17 +135,14 @@ do
     CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_OPENH264=OFF"
   fi
 
-	if [ $WITH_MEDIACODEC -ne 0 ];
+  if [ $WITH_MEDIACODEC -ne 0 ]; then
-	then
     CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_MEDIACODEC=ON"
   else
     CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_MEDIACODEC=OFF"
   fi
 
-	if [ $WITH_FFMPEG -ne 0 ];
+  if [ $WITH_FFMPEG -ne 0 ]; then
-	then
+    if [ $BUILD_DEPS -ne 0 ]; then
-		if [ $BUILD_DEPS -ne 0 ];
-		then
       common_run bash $SCRIPT_PATH/android-build-ffmpeg.sh \
         --src $BUILD_SRC/ffmpeg --dst $BUILD_DST \
         --sdk "$ANDROID_SDK" \
@@ -167,10 +156,8 @@ do
   else
     CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_FFMPEG=OFF -DWITH_SWSCALE=OFF"
   fi
-	if [ $WITH_AAD -ne 0 ];
+  if [ $WITH_AAD -ne 0 ]; then
-	then
+    if [ $BUILD_DEPS -ne 0 ]; then
-		if [ $BUILD_DEPS -ne 0 ];
-		then
       common_run bash $SCRIPT_PATH/android-build-cjson.sh \
         --src $BUILD_SRC/cjson --dst $BUILD_DST \
         --sdk "$ANDROID_SDK" \
@@ -181,10 +168,8 @@ do
         --hash $CJSON_HASH
     fi
   fi
-	if [ $WITH_OPENSSL -ne 0 ];
+  if [ $WITH_OPENSSL -ne 0 ]; then
-	then
+    if [ $BUILD_DEPS -ne 0 ]; then
-		if [ $BUILD_DEPS -ne 0 ];
-		then
       common_run bash $SCRIPT_PATH/android-build-openssl.sh \
         --src $BUILD_SRC/openssl --dst $BUILD_DST \
         --sdk "$ANDROID_SDK" \
@@ -197,8 +182,7 @@ do
   fi
 
   # Build and install the library.
-	if [ $DEPS_ONLY -eq 0 ];
+  if [ $DEPS_ONLY -eq 0 ]; then
-	then
     common_run cd $BASE
     common_run mkdir -p $BUILD_SRC/freerdp-build/$ARCH
     common_run cd $BUILD_SRC/freerdp-build/$ARCH

scripts/android-build-openh264.sh

@@ -28,9 +28,7 @@ function build {
 common_parse_arguments $@
 common_update $SCM_URL $SCM_TAG $BUILD_SRC $SCM_HASH
 
-
+for ARCH in $BUILD_ARCH; do
-for ARCH in $BUILD_ARCH
-do
   case $ARCH in
   "armeabi")
     OARCH="arm"
@@ -50,14 +48,12 @@ do
 
   build $OARCH $NDK_TARGET
 
-	if [ ! -d $BUILD_DST/$ARCH/include ];
+  if [ ! -d $BUILD_DST/$ARCH/include ]; then
-	then
     common_run mkdir -p $BUILD_DST/$ARCH/include
   fi
 
   common_run cp -L -r $BUILD_SRC/libs/$OARCH/include/ $BUILD_DST/$ARCH/
-	if [ ! -d $BUILD_DST/$ARCH ];
+  if [ ! -d $BUILD_DST/$ARCH ]; then
-	then
     common_run mkdir -p $BUILD_DST/$ARCH
   fi
   common_run cp -L $BUILD_SRC/libs/$OARCH/lib/*.so $BUILD_DST/$ARCH/

scripts/android-build-openssl.sh

@@ -9,8 +9,7 @@ COMPILER=4.9
 source $(dirname "${BASH_SOURCE[0]}")/android-build-common.sh
 
 function build {
-	if [ $# -ne 2 ];
+  if [ $# -ne 2 ]; then
-	then
     echo "Invalid arguments $@"
     exit 1
   fi
@@ -32,8 +31,7 @@ function build {
   common_run ./Configure ${CONFIG} -D__ANDROID_API__=$NDK_TARGET
   common_run make SHLIB_EXT=.so -j build_libs
 
-	if [ ! -d $DST_DIR ];
+  if [ ! -d $DST_DIR ]; then
-	then
     common_run mkdir -p $DST_DIR
   fi
 
@@ -50,12 +48,12 @@ SCM_MOD_TAG=$SCM_TAG
 case $SCM_TAG in OpenSSL_*)
   SCM_MOD_TAG=${SCM_TAG//OpenSSL_/openssl-}
   SCM_MOD_TAG=${SCM_MOD_TAG//_/.}
+  ;;
 esac
 common_update "$SCM_URL/$SCM_TAG" $SCM_MOD_TAG $BUILD_SRC $SCM_HASH
 
 ORG_PATH=$PATH
-for ARCH in $BUILD_ARCH
+for ARCH in $BUILD_ARCH; do
-do
 
   case $ARCH in
   "armeabi-v7a")
@@ -77,9 +75,7 @@ do
   esac
 done
 
-if [ ! -d $BUILD_DST/$ARCH/include ];
+if [ ! -d $BUILD_DST/$ARCH/include ]; then
-then
   common_run mkdir -p $BUILD_DST/$ARCH/include
 fi
 common_run cp -L -R $BUILD_SRC/include/openssl $BUILD_DST/$ARCH/include/
-

scripts/bundle-mac-os.sh

@@ -14,7 +14,7 @@ DATADIR=Resources
 DEPLOYMENT_ARCH='arm64 x86_64'
 DEPLOYMENT_TARGET=12
 
-usage () {
+usage() {
   echo "${BASH_SOURCE[0]} [-a|--arch 'arch1 arch2 ...'] [-t|--target target][-h|--help]"
   echo ""
   echo "default options:"
@@ -23,15 +23,13 @@ usage () {
 }
 
 check_tools() {
-    for TOOL in mkdir rm mv git dirname pwd find cut basename grep xargs cmake ninja autoconf automake aclocal autoheader glibtoolize lipo otool install_name_tool;
+  for TOOL in mkdir rm mv git dirname pwd find cut basename grep xargs cmake ninja autoconf automake aclocal autoheader glibtoolize lipo otool install_name_tool; do
-    do
     set +e
     TOOL_PATH=$(which "$TOOL")
     set -e
     echo "$TOOL: $TOOL_PATH"
 
-        if [ ! -f "$TOOL_PATH" ];
+    if [ ! -f "$TOOL_PATH" ]; then
-        then
       echo "Missing $TOOL! please install and add to PATH."
       exit 1
     fi
@@ -40,21 +38,21 @@ check_tools() {
 
 while [[ $# -gt 0 ]]; do
   case $1 in
-    -a|--arch)
+  -a | --arch)
     DEPLOYMENT_ARCH="$2"
     shift # past argument
     shift # past value
     ;;
-    -t|--target)
+  -t | --target)
     DEPLOYMENT_TARGET="$2"
     shift # past argument
     shift # past value
     ;;
-    -t|--target)
+  -t | --target)
     usage
     exit 0
     ;;
-    -*|--*)
+  -* | --*)
     usage
     exit 1
     ;;
@@ -71,30 +69,24 @@ fix_rpath() {
   SEARCH_PATH=$1
   FIX_PATH=$1
   EXT=".dylib"
-	if [ "$#" -gt 1 ];
+  if [ "$#" -gt 1 ]; then
-	then
     FIX_PATH=$2
   fi
-	if [ "$#" -gt 2 ];
+  if [ "$#" -gt 2 ]; then
-	then
     EXT=$3
   fi
 
   # some build systems do not handle @rpath on mac os correctly.
   # do check that and fix it.
   DYLIB_ABS_NAMES=$(find $SEARCH_PATH -type f -name "*$EXT")
-  for DYLIB_ABS in $DYLIB_ABS_NAMES;
+  for DYLIB_ABS in $DYLIB_ABS_NAMES; do
-  do
     DYLIB_NAME=$(basename $DYLIB_ABS)
     install_name_tool -id @rpath/$DYLIB_NAME $DYLIB_ABS
 
-  	for DYLIB_DEP in $(otool -L $DYLIB_ABS | grep "$FIX_PATH" | cut -d' ' -f1);
+    for DYLIB_DEP in $(otool -L $DYLIB_ABS | grep "$FIX_PATH" | cut -d' ' -f1); do
-  	do
+      if [[ $DYLIB_DEP == $DYLIB_ABS ]]; then
-  		if [[ $DYLIB_DEP == $DYLIB_ABS ]];
-  		then
         continue
-  		elif [[ $DYLIB_DEP == $FIX_PATH/* ]];
+      elif [[ $DYLIB_DEP == $FIX_PATH/* ]]; then
-  		then
         DEP_BASE=$(basename $DYLIB_DEP)
         install_name_tool -change $DYLIB_DEP @rpath/$DEP_BASE $DYLIB_ABS
       fi
@@ -104,8 +96,7 @@ fix_rpath() {
 
 replace_rpath() {
   FILE=$1
-	for PTH in $(otool -l $FILE | grep -A2 LC_RPATH  | grep path | xargs -J ' ' | cut -d ' ' -f2);
+  for PTH in $(otool -l $FILE | grep -A2 LC_RPATH | grep path | xargs -J ' ' | cut -d ' ' -f2); do
-	do
     install_name_tool -delete_rpath $PTH $FILE
   done
   install_name_tool -add_rpath @loader_path/../$LIBDIR $FILE
@@ -113,8 +104,7 @@ replace_rpath() {
 
 CMAKE_ARCHS=
 OSSL_FLAGS="-mmacosx-version-min=$DEPLOYMENT_TARGET -I$INSTALL/include -L$INSTALL/lib"
-for ARCH in $DEPLOYMENT_ARCH;
+for ARCH in $DEPLOYMENT_ARCH; do
-do
   OSSL_FLAGS="$OSSL_FLAGS -arch $ARCH"
   CMAKE_ARCHS="$ARCH;$CMAKE_ARCHS"
 done
@@ -140,8 +130,7 @@ CMAKE_ARGS="-DCMAKE_SKIP_INSTALL_ALL_DEPENDENCY=ON \
 	-DCMAKE_IGNORE_PREFIX_PATH='/opt/local;/usr/local;/opt/homebrew;/Library;~/Library'
 	"
 
-if [ ! -d $SRC ];
+if [ ! -d $SRC ]; then
-then
   mkdir -p $SRC
   cd $SRC
   git clone --depth 1 -b openssl-3.3.1 https://github.com/openssl/openssl.git
@@ -162,13 +151,11 @@ then
   ./bootstrap
 fi
 
-if [ -d $INSTALL ];
+if [ -d $INSTALL ]; then
-then
   rm -rf $INSTALL
 fi
 
-if [ -d $BUILD ];
+if [ -d $BUILD ]; then
-then
   rm -rf $BUILD
 fi
 
@@ -237,8 +224,7 @@ meson setup --prefix="$INSTALL" -Doptimization=3 -Db_lto=true -Db_pie=true -Dc_a
   -Dlibdir=lib openh264 $SRC/openh264
 ninja -C openh264 install
 
-for ARCH in $DEPLOYMENT_ARCH;
+for ARCH in $DEPLOYMENT_ARCH; do
-do
   mkdir -p $BUILD/FFmpeg/$ARCH
   cd $BUILD/FFmpeg/$ARCH
   FFCFLAGS="-arch $ARCH -mmacosx-version-min=$DEPLOYMENT_TARGET"
@@ -259,8 +245,7 @@ find lib -type l -exec cp -P {} $INSTALL/lib/ \;
 BASE_LIBS=$(find lib -type f -name "*.dylib" -exec basename {} \;)
 
 cd $BUILD/FFmpeg/install
-for LIB in $BASE_LIBS;
+for LIB in $BASE_LIBS; do
-do
   LIBS=$(find . -name $LIB)
   lipo $LIBS -output $INSTALL/lib/$LIB -create
 done
@@ -301,13 +286,11 @@ mv lib $LIBDIR
 mv bin $BINDIR
 
 # update RPATH
-for LIB in $(find $LIBDIR -type f -name "*.dylib");
+for LIB in $(find $LIBDIR -type f -name "*.dylib"); do
-do
   replace_rpath $LIB
 done
 
-for BIN in $(find $BINDIR -type f);
+for BIN in $(find $BINDIR -type f); do
-do
   replace_rpath $BIN
 done
 

scripts/cmake-format.sh

@@ -6,10 +6,8 @@ SRC_PATH="${SCRIPT_PATH}/.."
 
 FORMAT_ARG="--check"
 REST_ARGS=$@
-if [ $# -ne 0 ]
+if [ $# -ne 0 ]; then
-then
+  if [ "$1" = "--help" ] || [ "$1" = "-h" ]; then
-	if [ "$1" = "--help" ] || [ "$1" = "-h" ];
-	then
     echo "usage: $0 [options] [file, file, ...]"
     echo "\t--check.-c  ... run format check only, no files changed (default)"
     echo "\t--format,-f ... format files in place"
@@ -18,26 +16,22 @@ then
     exit 1
   fi
 
-	if [ "$1" = "--check" ] || [ "$1" = "-c" ];
+  if [ "$1" = "--check" ] || [ "$1" = "-c" ]; then
-	then
     FORMAT_ARG="--check"
     REST_ARGS="${@:2}"
   fi
-	if [ "$1" = "--format" ] || [ "$1" = "-f" ];
+  if [ "$1" = "--format" ] || [ "$1" = "-f" ]; then
-	then
     FORMAT_ARG="-i"
     REST_ARGS="${@:2}"
   fi
 fi
 
-if [ ! -n "$REST_ARGS" ];
+if [ ! -n "$REST_ARGS" ]; then
-then
   CMAKE_FILES=$(find ${SRC_PATH} -name "*.cmake" -o -name "CMakeLists.txt")
   CMAKE_CI_FILES=$(find ${SRC_PATH}/ci -name "*.txt")
 fi
 
-for FILE in $CMAKE_FILES $CMAKE_CI_FILES $REST_ARGS;
+for FILE in $CMAKE_FILES $CMAKE_CI_FILES $REST_ARGS; do
-do
   echo "processing file $FILE..."
   cmake-format -c "$SCRIPT_PATH/cmake-format.yml" $FORMAT_ARG $FILE
 done

scripts/create_release_tarball.sh

@@ -3,33 +3,34 @@
 function run {
   "$@"
   RES=$?
-	if [[ $RES -ne 0 ]];
+  if [[ $RES -ne 0 ]]; then
-	then
     echo "[ERROR] $@ returned $RES" >&2
     exit 1
   fi
 }
 
-if [ -z ${TAG:-} ];then
+if [ -z ${TAG:-} ]; then
   echo "No TAG set - trying to detect"
   TAG=$(git describe --tags)
   echo "Is the TAG ${TAG} ok (YES|NO)?"
   read answ
   case "$answ" in
-		YES):
+  YES)
+    :
     ;;
   *)
     echo 'stopping here'
     exit 1
+    ;;
   esac
 fi
 
 function create_hash {
   NAME=$1
-	run md5sum ${NAME} > ${NAME}.md5
+  run md5sum ${NAME} >${NAME}.md5
-	run sha1sum ${NAME} > ${NAME}.sha1
+  run sha1sum ${NAME} >${NAME}.sha1
-	run sha256sum ${NAME} > ${NAME}.sha256
+  run sha256sum ${NAME} >${NAME}.sha256
-	run sha512sum ${NAME} > ${NAME}.sha512
+  run sha512sum ${NAME} >${NAME}.sha512
 }
 
 function create_tar {
@@ -46,7 +47,7 @@ TMPDIR=$(mktemp -d -t release-${TAG}-XXXXXXXXXX)
 
 run git archive --prefix=freerdp-${TAG}/ --format=tar.gz -o ${TMPDIR}/freerdp-${TAG}.tar.gz ${TAG}
 run tar xzvf ${TMPDIR}/freerdp-${TAG}.tar.gz -C ${TMPDIR}
-run echo ${TAG} > ${TMPDIR}/freerdp-${TAG}/.source_version
+run echo ${TAG} >${TMPDIR}/freerdp-${TAG}/.source_version
 
 pushd .
 cd $TMPDIR
@@ -60,8 +61,7 @@ create_hash ${ZIPNAME}
 popd
 
 # Sign the release tarballs
-for EXT in tar.gz tar.bz2 tar.xz zip;
+for EXT in tar.gz tar.bz2 tar.xz zip; do
-do
   run gpg --local-user 0xA49454A3FC909FD5 --sign --armor --output ${TMPDIR}/freerdp-${TAG}.${EXT}.asc --detach-sig ${TMPDIR}/freerdp-${TAG}.${EXT}
 done
 
@@ -70,8 +70,7 @@ run mv ${TMPDIR}/freerdp-${TAG}.zip* .
 run rm -rf ${TMPDIR}
 
 # Verify the release tarball signatures
-for EXT in tar.gz tar.bz2 tar.xz zip;
+for EXT in tar.gz tar.bz2 tar.xz zip; do
-do
   run gpg --verify freerdp-${TAG}.${EXT}.asc
 done
 

scripts/xcode.sh

@@ -28,43 +28,43 @@ popd
 # Check for errors; otherwise, ask for compile.
 if [ "$?" -ne 0 ]; then
   echo "CMake failed. Please check error messages"
-    popd > /dev/null
+  popd >/dev/null
   exit
 else
   popd
-    while true
+  while true; do
-	do
     echo -n "Compile FreeRDP? (y or n) - (y recommended for MacFreeRDP compilation):"
     read CONFIRM
     case $CONFIRM in
-	y|Y|YES|yes|Yes)
+    y | Y | YES | yes | Yes)
       pushd ./${XCODE_PROJ_DIR}
       xcodebuild
       popd
-		break ;;
+      break
-	n|N|no|NO|No)
+      ;;
+    n | N | no | NO | No)
       echo OK - you entered $CONFIRM
       break
       ;;
-	*) echo Please enter only y or n
+    *) echo Please enter only y or n ;;
     esac
   done
 
   echo "SUCCESS!"
-	while true
+  while true; do
-	do
     echo -n "Open Xcode projects now? (y or n):"
     read CONFIRM
     case $CONFIRM in
-	y|Y|YES|yes|Yes)
+    y | Y | YES | yes | Yes)
       open ${CLIENT_MAC_DIR}/${XCODE_PROJ_DIR}/MacFreeRDP.xcodeproj
       open ./${XCODE_PROJ_DIR}/FreeRDP.xcodeproj
-		break ;;
+      break
-	n|N|no|NO|No)
+      ;;
+    n | N | no | NO | No)
       echo OK - $CONFIRM
       break
       ;;
-	*) echo Please enter only y or n
+    *) echo Please enter only y or n ;;
     esac
   done