nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scripts: fix mixed indentation

Browse Source
This commit is contained in:
Martin Weinelt 2020-09-13 19:21:15 +02:00 committed by Jan-Niklas Burfeind
parent 6ed243fb2b
commit 6992a3d1ac
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
scripts/copy_output.lua
View File

@ -69,16 +69,16 @@ end
-- copy kernel image with debug symbols -- copy kernel image with debug symbols
local kernel_debug_glob = string.format('%s/gluon-\0-%s-kernel-debug.tar.zst', local kernel_debug_glob = string.format('%s/gluon-\0-%s-kernel-debug.tar.zst',
env.GLUON_DEBUGDIR, env.GLUON_DEBUGDIR,
target) target)
lib.exec {'rm', '-f', kernel_debug_glob} lib.exec {'rm', '-f', kernel_debug_glob}
local kernel_debug_source = string.format('openwrt/bin/targets/%s/kernel-debug.tar.zst', 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', local kernel_debug_dest = string.format('%s/gluon-%s-%s-%s-kernel-debug.tar.zst',
env.GLUON_DEBUGDIR, env.GLUON_DEBUGDIR,
lib.site_code, lib.site_code,
env.GLUON_RELEASE, env.GLUON_RELEASE,
target) target)
lib.exec {'cp', kernel_debug_source, kernel_debug_dest} lib.exec {'cp', kernel_debug_source, kernel_debug_dest}

4
scripts/update.sh
View File

@ -21,8 +21,8 @@ for module in $GLUON_MODULES; do
if ! git branch -f base "$commit" 2>/dev/null; then if ! git branch -f base "$commit" 2>/dev/null; then
git fetch "$repo" "$branch" git fetch "$repo" "$branch"
git branch -f base "$commit" || { git branch -f base "$commit" || {
echo "unable to find commit \"$commit\" on branch \"$branch\" in repo \"$repo\"." >&2 echo "unable to find commit \"$commit\" on branch \"$branch\" in repo \"$repo\"." >&2
exit 1 exit 1
} }
fi fi
done done