From patchwork Thu Feb 4 23:59:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 1436342 X-Patchwork-Delegate: mail@aparcar.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=pG9Jgjdk; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DWwcm5rtxz9sWj for ; Fri, 5 Feb 2021 11:03:51 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=LPAY5Ew8aRssfGAOyQ8ZzSee9sO2IUoMd3YO/h3h6nQ=; b=pG9JgjdkFWeXNlf66Wh8RshCpy 4pRoA9ZQm+Uhq89/2ixP1HqUUPbDe2/+tNXeOWcjOdIXpEnLS2czOAAB4g/9u7pouw7dv8TkbnP31 24CY3PctqCKysTJRfWOb/jVk08o7Jo3MYzGtpk5uqkTmbXnlFEm2Hq9p6fDJTcMmuITaAszW5PT3Q aE2W5z5MDFbc67o82zuOFLTw4sSZKlQbzOmfwymKozuC1H1DlmrdaF3h8argty87bFcI+QaD/OPn3 2esJckj4DRq1Gol/iX9z7Zm63QlUmAgVd3wyZJbpKLtgc3NchQr31v5j2yL2VvkL70HbtTTBGnr/J h6j90qFQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7oXF-0006ri-Rs; Thu, 04 Feb 2021 23:59:41 +0000 Received: from relay2-d.mail.gandi.net ([217.70.183.194]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7oXD-0006qw-30 for openwrt-devel@lists.openwrt.org; Thu, 04 Feb 2021 23:59:40 +0000 X-Originating-IP: 72.235.129.18 Received: from dawn.lan (udp100268uds.hawaiiantel.net [72.235.129.18]) (Authenticated sender: mail@aparcar.org) by relay2-d.mail.gandi.net (Postfix) with ESMTPA id DA7EC40004; Thu, 4 Feb 2021 23:59:31 +0000 (UTC) From: Paul Spooren To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 1/3] scripts,ipkg-build: apply shellcheck Date: Thu, 4 Feb 2021 13:59:21 -1000 Message-Id: <20210204235923.768198-1-mail@aparcar.org> X-Mailer: git-send-email 2.30.0 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210204_185939_318524_B82EA62E X-CRM114-Status: GOOD ( 10.09 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.194 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [217.70.183.194 listed in wl.mailspike.net] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ~aparcar/openwrt-devel-test@lists.sr.ht, Paul Spooren Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This commit cleans the `ipkg-build` script via changes suggested by shellcheck. These are mostly word splitting issues. Remove the definition of GZIP, this adds three "lookups" of the `gzip` binary but the rest of the build system doesn't seem to use such improvements neither. Signed-off-by: Paul Spooren --- scripts/ipkg-build | 81 +++++++++++++++++++++++----------------------- 1 file changed, 40 insertions(+), 41 deletions(-) diff --git a/scripts/ipkg-build b/scripts/ipkg-build index 343aab6caf..8533c97fcc 100755 --- a/scripts/ipkg-build +++ b/scripts/ipkg-build @@ -13,7 +13,6 @@ version=1.0 FIND="$(command -v find)" FIND="${FIND:-$(command -v gfind)}" TAR="${TAR:-$(command -v tar)}" -GZIP="$(command -v gzip)" # try to use fixed source epoch if [ -n "$PKG_SOURCE_DATE_EPOCH" ]; then @@ -31,40 +30,40 @@ ipkg_extract_value() { required_field() { field=$1 - grep "^$field:" < $CONTROL/control | ipkg_extract_value + grep "^$field:" < "$CONTROL/control" | ipkg_extract_value } pkg_appears_sane() { - local pkg_dir=$1 + local pkg_dir="$1" - local owd=$PWD - cd $pkg_dir + local owd="$PWD" + cd "$pkg_dir" PKG_ERROR=0 - pkg=`required_field Package` - version=`required_field Version | sed 's/Version://; s/^.://g;'` - arch=`required_field Architecture` + pkg="$(required_field Package)" + version="$(required_field Version | sed 's/Version://; s/^.://g;')" + arch="$(required_field Architecture)" - if echo $pkg | grep '[^a-zA-Z0-9_.+-]'; then + 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; fi - if [ -f $CONTROL/conffiles ]; then - rm -f $CONTROL/conffiles.resolved + 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 + for cf in $($FIND $(sed -e "s!^/!$pkg_dir/!" "$CONTROL/conffiles") -type f); do + echo "${cf#$pkg_dir}" >> "$CONTROL/conffiles.resolved" done - rm $CONTROL/conffiles - if [ -f $CONTROL/conffiles.resolved ]; then - mv $CONTROL/conffiles.resolved $CONTROL/conffiles - chmod 0644 $CONTROL/conffiles + rm "$CONTROL"/conffiles + if [ -f "$CONTROL"/conffiles.resolved ]; then + mv "$CONTROL"/conffiles.resolved "$CONTROL"/conffiles + chmod 0644 "$CONTROL"/conffiles fi fi - cd $owd + cd "$owd" return $PKG_ERROR } @@ -95,17 +94,17 @@ file_modes="" usage="Usage: $0 [-v] [-h] [-m] []" while getopts "hvm:" opt; do case $opt in - v ) echo $version + v ) echo "$version" exit 0 ;; - h ) echo $usage >&2 ;; + h ) echo "$usage" >&2 ;; m ) file_modes=$OPTARG ;; - \? ) echo $usage >&2 + \? ) echo "$usage" >&2 esac done -shift $(($OPTIND - 1)) +shift $((OPTIND - 1)) # continue on to process additional arguments @@ -115,42 +114,42 @@ case $# in ;; 2) dest_dir=$2 - if [ "$dest_dir" = "." -o "$dest_dir" = "./" ] ; then + if [ "$dest_dir" = "." ] || [ "$dest_dir" = "./" ] ; then dest_dir=$PWD fi ;; *) - echo $usage >&2 + echo "$usage" >&2 exit 1 ;; esac -pkg_dir=$1 +pkg_dir="$1" -if [ ! -d $pkg_dir ]; then +if [ ! -d "$pkg_dir" ]; then echo "*** Error: Directory $pkg_dir does not exist" >&2 exit 1 fi # CONTROL is second so that it takes precedence CONTROL= -[ -d $pkg_dir/CONTROL ] && CONTROL=CONTROL +[ -d "$pkg_dir"/CONTROL ] && CONTROL=CONTROL if [ -z "$CONTROL" ]; then echo "*** Error: Directory $pkg_dir has no CONTROL subdirectory." >&2 exit 1 fi -if ! pkg_appears_sane $pkg_dir; then +if ! pkg_appears_sane "$pkg_dir"; then echo >&2 echo "ipkg-build: Please fix the above errors and try again." >&2 exit 1 fi tmp_dir=$dest_dir/IPKG_BUILD.$$ -mkdir $tmp_dir +mkdir "$tmp_dir" -echo $CONTROL > $tmp_dir/tarX -cd $pkg_dir +echo $CONTROL > "$tmp_dir"/tarX +cd "$pkg_dir" for file_mode in $file_modes; do case $file_mode in /*:*:*:*) @@ -179,22 +178,22 @@ for file_mode in $file_modes; do chown "$uid:$gid" "$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` +installed_size=$(stat -c "%s" "$tmp_dir"/data.tar.gz) sed -i -e "s/^Installed-Size: .*/Installed-Size: $installed_size/" \ - $pkg_dir/$CONTROL/control + "$pkg_dir"/$CONTROL/control -( cd $pkg_dir/$CONTROL && $TAR --format=gnu --sort=name -cf - --mtime="$TIMESTAMP" . | $GZIP -n - > $tmp_dir/control.tar.gz ) -rm $tmp_dir/tarX +( 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 ) +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" ) -rm $tmp_dir/debian-binary $tmp_dir/data.tar.gz $tmp_dir/control.tar.gz -rmdir $tmp_dir +rm "$tmp_dir"/debian-binary "$tmp_dir"/data.tar.gz "$tmp_dir"/control.tar.gz +rmdir "$tmp_dir" echo "Packaged contents of $pkg_dir into $pkg_file" From patchwork Thu Feb 4 23:59:22 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 1436344 X-Patchwork-Delegate: mail@aparcar.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=M9SGr1IU; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DWwcp3kl5z9sX5 for ; Fri, 5 Feb 2021 11:03:54 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=ztpcylMBGLPfkBHuZpH56YkQt0V0TgG5UtBePDTQ6Vg=; b=M9SGr1IU7IPJ4wscJ3phNSjN5 VJBLO1TQoNB89/O0IOvRyzN2pj9d4kq7fyIuu1tbAr8sLlFMeSTGWN6PtGPG8aecygOVGB41FeQoo UGChTirW+yiaUFrFHlu7/+t7/et3p1oPIawnar+tj/s3Rzcj0OxRYp/pzeI8s9QYB6/p1o1X4cW+I 8XJk+23zVIp8v/zNucBZryze4ryB88OR82MeTi1WoytIRFLRdza4y9aIeQXBorPA6n3tZNgDKxR+M 6eTOlIACNsu01oNunKU/Oedc0IN5TJGEewZf+w2AngokmrnmO5NBSVzfUpP6TCSC8iDDJyMQukVZ2 Ad436hcSA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7oXH-0006s9-4d; Thu, 04 Feb 2021 23:59:43 +0000 Received: from relay2-d.mail.gandi.net ([217.70.183.194]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7oXD-0006qz-MB for openwrt-devel@lists.openwrt.org; Thu, 04 Feb 2021 23:59:40 +0000 X-Originating-IP: 72.235.129.18 Received: from dawn.lan (udp100268uds.hawaiiantel.net [72.235.129.18]) (Authenticated sender: mail@aparcar.org) by relay2-d.mail.gandi.net (Postfix) with ESMTPA id C5FAE40006; Thu, 4 Feb 2021 23:59:36 +0000 (UTC) From: Paul Spooren To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 2/3] scripts,ipkg-build: use realpath for pkg_dir Date: Thu, 4 Feb 2021 13:59:22 -1000 Message-Id: <20210204235923.768198-2-mail@aparcar.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204235923.768198-1-mail@aparcar.org> References: <20210204235923.768198-1-mail@aparcar.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210204_185939_937180_07ACBFC0 X-CRM114-Status: GOOD ( 10.02 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [217.70.183.194 listed in wl.mailspike.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.194 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ~aparcar/openwrt-devel-test@lists.sr.ht, Paul Spooren Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This allows manual execution of the ipkg-build script even with releative path. Signed-off-by: Paul Spooren --- scripts/ipkg-build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ipkg-build b/scripts/ipkg-build index 8533c97fcc..c112270a2b 100755 --- a/scripts/ipkg-build +++ b/scripts/ipkg-build @@ -124,7 +124,7 @@ case $# in ;; esac -pkg_dir="$1" +pkg_dir="$(realpath "$1")" if [ ! -d "$pkg_dir" ]; then echo "*** Error: Directory $pkg_dir does not exist" >&2 From patchwork Thu Feb 4 23:59:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Spooren X-Patchwork-Id: 1436343 X-Patchwork-Delegate: mail@aparcar.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=fvVpaaJd; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DWwcn4KQxz9sWw for ; Fri, 5 Feb 2021 11:03:53 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=3wKOqaLPKTYSPKtV58axq+FeZwmlR4S3eMZUAiX4zwg=; b=fvVpaaJdDUJ6VgULVuI9m63Q5 dKuFOSQ1aWezlCNK1aQYX/ECJInha318bGFngl0g9ciuTlvDqg2zUaRiTQwg+C8VSdi2wXvUU/VF3 IAih0Lh+jhBtHqguqnLS4f10K/BhJdaPOeMH5yhBmz99k+W05m+0tUAC9oXH1LTVZzj82Ym4b40W+ 1J2xBukZU9u6U/v7fPoGqfMLRBIaK0FwZd/HXqNkrC7zPCZHKViHNJ3oEYhrvp1ijEPC+bVoyPrHX Qbw4euUAh9FXqFnlmT6q5T0bp17W/JADSJbQSACuWxFR17+U1/zTc+0GJZwJLjEOwxPYapRAblPBu KvXpIhZKA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7oXI-0006sf-N8; Thu, 04 Feb 2021 23:59:44 +0000 Received: from relay2-d.mail.gandi.net ([217.70.183.194]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1l7oXG-0006rh-4W for openwrt-devel@lists.openwrt.org; Thu, 04 Feb 2021 23:59:43 +0000 X-Originating-IP: 72.235.129.18 Received: from dawn.lan (udp100268uds.hawaiiantel.net [72.235.129.18]) (Authenticated sender: mail@aparcar.org) by relay2-d.mail.gandi.net (Postfix) with ESMTPA id 926E440007; Thu, 4 Feb 2021 23:59:39 +0000 (UTC) From: Paul Spooren To: openwrt-devel@lists.openwrt.org Subject: [PATCH v2 3/3] scripts,ipkg-build: format code with shfmt Date: Thu, 4 Feb 2021 13:59:23 -1000 Message-Id: <20210204235923.768198-3-mail@aparcar.org> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204235923.768198-1-mail@aparcar.org> References: <20210204235923.768198-1-mail@aparcar.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210204_185942_391421_4FA50CA2 X-CRM114-Status: GOOD ( 10.00 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [217.70.183.194 listed in wl.mailspike.net] -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [217.70.183.194 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: ~aparcar/openwrt-devel-test@lists.sr.ht, Paul Spooren Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The script improves readability by using an automatic code formatter. Signed-off-by: Paul Spooren --- scripts/ipkg-build | 71 ++++++++++++++++++++++++---------------------- 1 file changed, 37 insertions(+), 34 deletions(-) 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] []" 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"