From 6ed243fb2b3ffa8bce908fcc3e81761dd7010c72 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 13 Sep 2020 19:21:06 +0200 Subject: [PATCH 1/3] targets: fix mixed indentation Co-authored-by: Jan-Niklas Burfeind removed x86-legacy, added ramips-mt7621 --- targets/lantiq-xrx200 | 8 ++++---- targets/ramips-mt7621 | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/targets/lantiq-xrx200 b/targets/lantiq-xrx200 index 364c0c31..047db6da 100644 --- a/targets/lantiq-xrx200 +++ b/targets/lantiq-xrx200 @@ -49,10 +49,10 @@ device('avm-fritz-box-7412', 'avm_fritz7412', { -- TP-Link - -- CAVEAT: These devices don't have a dedicated WAN port. - -- All ethernet ports on the device are bridged and - -- used as WAN ports. Clients connected to these - -- ports will be connected to your private network. +-- CAVEAT: These devices don't have a dedicated WAN port. +-- All ethernet ports on the device are bridged and +-- used as WAN ports. Clients connected to these +-- ports will be connected to your private network. device('tp-link-td-w8970', 'tplink_tdw8970', { factory = false, diff --git a/targets/ramips-mt7621 b/targets/ramips-mt7621 index 4cc218ad..92f33843 100644 --- a/targets/ramips-mt7621 +++ b/targets/ramips-mt7621 @@ -8,7 +8,7 @@ device('asus-rt-ac57u', 'asus_rt-ac57u', { -- Cudy device('cudy-wr2100', 'cudy_wr2100', { - factory = false, + factory = false, }) From 6992a3d1ac8aaba5da7108749416b340a2684c71 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 13 Sep 2020 19:21:15 +0200 Subject: [PATCH 2/3] scripts: fix mixed indentation --- scripts/copy_output.lua | 14 +++++++------- scripts/update.sh | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/scripts/copy_output.lua b/scripts/copy_output.lua index b5c6f1b2..1af2f8f7 100755 --- a/scripts/copy_output.lua +++ b/scripts/copy_output.lua @@ -69,16 +69,16 @@ end -- copy kernel image with debug symbols local kernel_debug_glob = string.format('%s/gluon-\0-%s-kernel-debug.tar.zst', - env.GLUON_DEBUGDIR, - target) + env.GLUON_DEBUGDIR, + target) lib.exec {'rm', '-f', kernel_debug_glob} local kernel_debug_source = string.format('openwrt/bin/targets/%s/kernel-debug.tar.zst', - bindir) + bindir) local kernel_debug_dest = string.format('%s/gluon-%s-%s-%s-kernel-debug.tar.zst', - env.GLUON_DEBUGDIR, - lib.site_code, - env.GLUON_RELEASE, - target) + env.GLUON_DEBUGDIR, + lib.site_code, + env.GLUON_RELEASE, + target) lib.exec {'cp', kernel_debug_source, kernel_debug_dest} diff --git a/scripts/update.sh b/scripts/update.sh index 0d33a8cc..a9f28b05 100755 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -21,8 +21,8 @@ for module in $GLUON_MODULES; do if ! git branch -f base "$commit" 2>/dev/null; then git fetch "$repo" "$branch" git branch -f base "$commit" || { - echo "unable to find commit \"$commit\" on branch \"$branch\" in repo \"$repo\"." >&2 - exit 1 + echo "unable to find commit \"$commit\" on branch \"$branch\" in repo \"$repo\"." >&2 + exit 1 } fi done From 46d6bf8304c24e75783438af85d7727ba14836ef Mon Sep 17 00:00:00 2001 From: Jan-Niklas Burfeind Date: Fri, 16 Dec 2022 23:41:53 +0100 Subject: [PATCH 3/3] contrib/i18n-scan.pl: fix indentation --- .editorconfig | 2 ++ contrib/i18n-scan.pl | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.editorconfig b/.editorconfig index e633e8a6..cca66853 100644 --- a/.editorconfig +++ b/.editorconfig @@ -27,6 +27,8 @@ indent_size = 2 indent_style = space indent_size = 4 +[*.pl] + [*.py] indent_style = space indent_size = 4 diff --git a/contrib/i18n-scan.pl b/contrib/i18n-scan.pl index 29abefcc..e6aaf0de 100755 --- a/contrib/i18n-scan.pl +++ b/contrib/i18n-scan.pl @@ -79,7 +79,7 @@ if( open F, "find @ARGV -type f '(' -name '*.html' -o -name '*.lua' ')' |" ) { my $stag = quotemeta $1; my $etag = $stag; - $etag =~ s/\[/]/g; + $etag =~ s/\[/]/g; ( $res ) = extract_tagged($code, $stag, $etag);