diff mbox series

[v2,3/3] scripts,ipkg-build: format code with shfmt

Message ID 20210204235923.768198-3-mail@aparcar.org
State Superseded
Delegated to: Paul Spooren
Headers show
Series [v2,1/3] scripts,ipkg-build: apply shellcheck | expand

Commit Message

Paul Spooren Feb. 4, 2021, 11:59 p.m. UTC 
The script improves readability by using an automatic code formatter.

Signed-off-by: Paul Spooren <mail@aparcar.org>
---
 scripts/ipkg-build | 71 ++++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 34 deletions(-)

Comments

Paul Spooren March 15, 2021, 5:40 a.m. UTC | #1 
Hi Paul,

I'm using shfmt[1] without any extra args. Looking through the issues 
over there[2] I'll reformat it with `-sr` and `-kp`. Thanks for the 
comment.

  -sr redirect operators will be followed by a space
  -kp keep column alignment paddings

Best,
Paul

[1]: https://github.com/mvdan/sh
[2]: https://github.com/mvdan/sh/issues/377

On Tue, Feb 9, 2021 at 13:36, Paul Oranje <por@oranjevos.nl> wrote:
> Op 5 feb. 2021, om 00:59 heeft Paul Spooren <mail@aparcar.org> het 
> volgende geschreven:
>> 
>>  The script improves readability by using an automatic code 
>> formatter.
> 
> The decreases of the switch case indentation levels make sense, but 
> IMHO the removals of the space between redirection and source (e.g. 
> <prog i.s.o. < prog) do not add to the readability, and to a lesser 
> degree, nor does placing an empty or small command on the same line 
> as the case (e.g. case x) ;;).
> 
> Maybe your preferred code formatter/beautifier (which ?) could take 
> some options to steer the formatting. Would you agree?
> 
> Thanks anyway, bye,
> Paul
diff mbox series

Patch

diff --git a/scripts/ipkg-build b/scripts/ipkg-build
index c112270a2b..89952cff4e 100755
--- a/scripts/ipkg-build
+++ b/scripts/ipkg-build
@@ -30,7 +30,7 @@  ipkg_extract_value() {
 required_field() {
 	field=$1
 
-	grep "^$field:" < "$CONTROL/control" | ipkg_extract_value
+	grep "^$field:" <"$CONTROL/control" | ipkg_extract_value
 }
 
 pkg_appears_sane() {
@@ -46,14 +46,14 @@  pkg_appears_sane() {
 
 	if echo "$pkg" | grep '[^a-zA-Z0-9_.+-]'; then
 		echo "*** Error: Package name $name contains illegal characters, (other than [a-z0-9.+-])" >&2
-		PKG_ERROR=1;
+		PKG_ERROR=1
 	fi
 
 	if [ -f "$CONTROL/conffiles" ]; then
 		rm -f "$CONTROL/conffiles.resolved"
 
 		for cf in $($FIND $(sed -e "s!^/!$pkg_dir/!" "$CONTROL/conffiles") -type f); do
-			echo "${cf#$pkg_dir}" >> "$CONTROL/conffiles.resolved"
+			echo "${cf#$pkg_dir}" >>"$CONTROL/conffiles.resolved"
 		done
 
 		rm "$CONTROL"/conffiles
@@ -71,14 +71,14 @@  resolve_file_mode_id() {
 	local var=$1 type=$2 name=$3 id
 
 	case "$name" in
-		root)
-			id=0
+	root)
+		id=0
 		;;
-		*[!0-9]*)
-			id=$(sed -ne "s#^$type $name \\([0-9]\\+\\)\\b.*\$#\\1#p" "$TOPDIR/tmp/.packageusergroup" 2>/dev/null)
+	*[!0-9]*)
+		id=$(sed -ne "s#^$type $name \\([0-9]\\+\\)\\b.*\$#\\1#p" "$TOPDIR/tmp/.packageusergroup" 2>/dev/null)
 		;;
-		*)
-			id=$name
+	*)
+		id=$name
 		;;
 	esac
 
@@ -93,17 +93,17 @@  resolve_file_mode_id() {
 file_modes=""
 usage="Usage: $0 [-v] [-h] [-m] <pkg_directory> [<destination_directory>]"
 while getopts "hvm:" opt; do
-    case $opt in
-	v ) echo "$version"
-	    exit 0
-	    ;;
-	h ) 	echo "$usage"  >&2 ;;
-	m )	file_modes=$OPTARG ;;
-	\? ) 	echo "$usage"  >&2
+	case $opt in
+	v)
+		echo "$version"
+		exit 0
+		;;
+	h) echo "$usage" >&2 ;;
+	m) file_modes=$OPTARG ;;
+	\?) echo "$usage" >&2 ;;
 	esac
 done
 
-
 shift $((OPTIND - 1))
 
 # continue on to process additional arguments
@@ -114,8 +114,8 @@  case $# in
 	;;
 2)
 	dest_dir=$2
-	if [ "$dest_dir" = "." ] || [ "$dest_dir" = "./" ] ; then
-	    dest_dir=$PWD
+	if [ "$dest_dir" = "." ] || [ "$dest_dir" = "./" ]; then
+		dest_dir=$PWD
 	fi
 	;;
 *)
@@ -148,22 +148,25 @@  fi
 tmp_dir=$dest_dir/IPKG_BUILD.$$
 mkdir "$tmp_dir"
 
-echo $CONTROL > "$tmp_dir"/tarX
+echo $CONTROL >"$tmp_dir"/tarX
 cd "$pkg_dir"
 for file_mode in $file_modes; do
 	case $file_mode in
-	/*:*:*:*)
-	    ;;
+	/*:*:*:*) ;;
+
 	*)
-	    echo "ERROR: file modes must use absolute path and contain user:group:mode"
-	    echo "$file_mode"
-	    exit 1
-	    ;;
+		echo "ERROR: file modes must use absolute path and contain user:group:mode"
+		echo "$file_mode"
+		exit 1
+		;;
 	esac
 
-	mode=${file_mode##*:}; path=${file_mode%:*}
-	group=${path##*:};     path=${path%:*}
-	user=${path##*:};      path=${path%:*}
+	mode=${file_mode##*:}
+	path=${file_mode%:*}
+	group=${path##*:}
+	path=${path%:*}
+	user=${path##*:}
+	path=${path%:*}
 
 	if ! resolve_file_mode_id uid user "$user"; then
 		echo "ERROR: unable to resolve uid of $user" >&2
@@ -176,22 +179,22 @@  for file_mode in $file_modes; do
 	fi
 
 	chown "$uid:$gid" "$pkg_dir/$path"
-	chmod  "$mode" "$pkg_dir/$path"
+	chmod "$mode" "$pkg_dir/$path"
 done
-$TAR -X "$tmp_dir"/tarX --format=gnu --sort=name -cpf - --mtime="$TIMESTAMP" . | gzip -n - > "$tmp_dir"/data.tar.gz
+$TAR -X "$tmp_dir"/tarX --format=gnu --sort=name -cpf - --mtime="$TIMESTAMP" . | gzip -n - >"$tmp_dir"/data.tar.gz
 
 installed_size=$(stat -c "%s" "$tmp_dir"/data.tar.gz)
 sed -i -e "s/^Installed-Size: .*/Installed-Size: $installed_size/" \
 	"$pkg_dir"/$CONTROL/control
 
-( cd "$pkg_dir"/$CONTROL && $TAR --format=gnu --sort=name -cf -  --mtime="$TIMESTAMP" . | gzip -n - > "$tmp_dir"/control.tar.gz )
+(cd "$pkg_dir"/$CONTROL && $TAR --format=gnu --sort=name -cf - --mtime="$TIMESTAMP" . | gzip -n - >"$tmp_dir"/control.tar.gz)
 rm "$tmp_dir"/tarX
 
-echo "2.0" > "$tmp_dir"/debian-binary
+echo "2.0" >"$tmp_dir"/debian-binary
 
 pkg_file=$dest_dir/${pkg}_${version}_${arch}.ipk
 rm -f "$pkg_file"
-( cd "$tmp_dir" && $TAR --format=gnu --sort=name -cf -  --mtime="$TIMESTAMP" ./debian-binary ./data.tar.gz ./control.tar.gz | gzip -n - > "$pkg_file" )
+(cd "$tmp_dir" && $TAR --format=gnu --sort=name -cf - --mtime="$TIMESTAMP" ./debian-binary ./data.tar.gz ./control.tar.gz | gzip -n - >"$pkg_file")
 
 rm "$tmp_dir"/debian-binary "$tmp_dir"/data.tar.gz "$tmp_dir"/control.tar.gz
 rmdir "$tmp_dir"