[LEDE-DEV] [PATCH v3 02/13] scripts: fix formatting

John Crispin john at phrozen.org
Thu Oct 27 03:15:43 PDT 2016


patch looks good but subject and description do not match

	John

On 06/10/2016 10:50, Jan-Tarek Butt wrote:
> remove whitespaces on end of lines
> 
> Signed-off-by: Jan-Tarek Butt <tarek at ring0.de>
> ---
>  scripts/combined-ext-image.sh |  4 ++--
>  scripts/flashing/flash.sh     |  6 +++---
>  scripts/patch-kernel.sh       | 20 ++++++++++----------
>  scripts/rstrip.sh             |  2 +-
>  4 files changed, 16 insertions(+), 16 deletions(-)
> 
> diff --git a/scripts/combined-ext-image.sh b/scripts/combined-ext-image.sh
> index e54ae3a..c01cf40 100755
> --- a/scripts/combined-ext-image.sh
> +++ b/scripts/combined-ext-image.sh
> @@ -9,7 +9,7 @@
>  # Write image header followed by all specified files
>  # The header is padded to 64k, format is:
>  #  CE               magic word ("Combined Extended Image") (2 bytes)
> -#  <CE_VERSION>     file format version field (2 bytes) 
> +#  <CE_VERSION>     file format version field (2 bytes)
>  #  <TYPE>           short description of the target device (32 bytes)
>  #  <NUM FILES>      number of files following the header (2 byte)
>  #  <file1_name>     name of the first file (32 bytes)
> @@ -20,7 +20,7 @@
>  #  <fileN_md5>      md5 checksum of the Nth file (32 bytes)
>  
>  ## version history
> -# * version 1: initial file format with num files / name / length / md5 checksum 
> +# * version 1: initial file format with num files / name / length / md5 checksum
>  
>  ME="${0##*/}"
>  
> diff --git a/scripts/flashing/flash.sh b/scripts/flashing/flash.sh
> index 7f2cdf5..8973aac 100755
> --- a/scripts/flashing/flash.sh
> +++ b/scripts/flashing/flash.sh
> @@ -1,6 +1,6 @@
>  #!/bin/bash
>  #
> -# tftp flash script for wireless routers 
> +# tftp flash script for wireless routers
>  #
>  # Copyright (C) 2004 by Oleg I. Vdovikin <oleg at cs.msu.su>
>  # Copyright (C) 2005 by Waldemar Brodkorb <wbx at openwrt.org>
> @@ -24,10 +24,10 @@ if [ -z "$1" ] || [ ! -f "$1" ] || [ -z "$2" ]; then
>      echo Usage: "$0" firmware vendor
>  cat << EOF
>  IMPORTANT:
> -Notes for Linksys / Asus WL500gx router: 
> +Notes for Linksys / Asus WL500gx router:
>     be sure you have set boot_wait to yes. Power on your router
>     after executing this script.
> - 
> +
>  Notes for Asus WL500g router:
>     be sure POWER led is flashing (If this is not the case
>     poweroff the device, push the reset button & power on
> diff --git a/scripts/patch-kernel.sh b/scripts/patch-kernel.sh
> index f0f294e..4ca8783 100755
> --- a/scripts/patch-kernel.sh
> +++ b/scripts/patch-kernel.sh
> @@ -18,25 +18,25 @@ if [ ! -d "${patchdir}" ] ; then
>      echo "Aborting.  '${patchdir}' is not a directory."
>      exit 1
>  fi
> -    
> -for i in ${patchdir}/${patchpattern} ; do 
> +
> +for i in ${patchdir}/${patchpattern} ; do
>      case "$i" in
>  	*.gz)
> -	type="gzip"; uncomp="gunzip -dc"; ;; 
> +	type="gzip"; uncomp="gunzip -dc"; ;;
>  	*.bz)
> -	type="bzip"; uncomp="bunzip -dc"; ;; 
> +	type="bzip"; uncomp="bunzip -dc"; ;;
>  	*.bz2)
> -	type="bzip2"; uncomp="bunzip2 -dc"; ;; 
> +	type="bzip2"; uncomp="bunzip2 -dc"; ;;
>  	*.zip)
> -	type="zip"; uncomp="unzip -d"; ;; 
> +	type="zip"; uncomp="unzip -d"; ;;
>  	*.Z)
> -	type="compress"; uncomp="uncompress -c"; ;; 
> +	type="compress"; uncomp="uncompress -c"; ;;
>  	*)
> -	type="plaintext"; uncomp="cat"; ;; 
> +	type="plaintext"; uncomp="cat"; ;;
>      esac
> -    [ -d "${i}" ] && echo "Ignoring subdirectory ${i}" && continue	
> +    [ -d "${i}" ] && echo "Ignoring subdirectory ${i}" && continue
>      echo ""
> -    echo "Applying ${i} using ${type}: " 
> +    echo "Applying ${i} using ${type}: "
>      ${uncomp} "${i}" | ${PATCH:-patch} -f -p1 -d "${targetdir}"
>      if [ $? != 0 ] ; then
>          echo "Patch failed!  Please fix $i!"
> diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh
> index 5c8a5aa..57c76c0 100755
> --- a/scripts/rstrip.sh
> +++ b/scripts/rstrip.sh
> @@ -1,5 +1,5 @@
>  #!/usr/bin/env bash
> -# 
> +#
>  # Copyright (C) 2006 OpenWrt.org
>  #
>  # This is free software, licensed under the GNU General Public License v2.
> 



More information about the Lede-dev mailing list