From 304ea8e574116e7ef4d294c7dcbb1e5ed8b1bd89 Mon Sep 17 00:00:00 2001
From: viktorxda <35473052+viktorxda@users.noreply.github.com>
Date: Wed, 24 Jan 2024 04:47:08 +0100
Subject: [PATCH] [no ci] Scripts: minor formatting (#1280)
---
Makefile | 2 +-
general/overlay/usr/sbin/extutils | 2 +-
general/overlay/usr/sbin/sysupgrade | 4 ++--
general/scripts/clone_hisi2goke.sh | 5 ++---
general/scripts/rootfs_script.sh | 1 -
general/scripts/show_toolchains.sh | 3 +--
general/scripts/sync_goke.sh | 3 +--
7 files changed, 8 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index 04771936..2791e811 100644
--- a/Makefile
+++ b/Makefile
@@ -55,7 +55,7 @@ toolname:
@general/scripts/show_toolchains.sh $(CONFIG)
clean:
- @rm -rf $(TARGET)/images $(TARGET)/target
+ @rm -rf $(TARGET)/build $(TARGET)/images $(TARGET)/per-package $(TARGET)/target
distclean:
@rm -rf $(BR_FILE) $(TARGET)
diff --git a/general/overlay/usr/sbin/extutils b/general/overlay/usr/sbin/extutils
index be4d0ad7..6d276a19 100755
--- a/general/overlay/usr/sbin/extutils
+++ b/general/overlay/usr/sbin/extutils
@@ -1,5 +1,4 @@
#!/bin/sh
-
CMD=$(echo $0 | cut -d / -f 4)
ARCH=$(uname -m)
@@ -45,6 +44,7 @@ case "${CMD}" in
[ -f /usr/share/openipc/customizer.sh ] && echo "Run customizer script..." && sh /usr/share/openipc/customizer.sh && touch /etc/system.ok || echo "Customizer script not present..."
fi
;;
+
*)
;;
esac
diff --git a/general/overlay/usr/sbin/sysupgrade b/general/overlay/usr/sbin/sysupgrade
index acd2ac11..9342e39b 100755
--- a/general/overlay/usr/sbin/sysupgrade
+++ b/general/overlay/usr/sbin/sysupgrade
@@ -3,7 +3,7 @@
# OpenIPC.org | 2024
#
-scr_version=1.0.32
+scr_version=1.0.33
args=" $@"
@@ -107,10 +107,10 @@ free_resources() {
time=$(grep TIME_STAMP /etc/os-release | cut -d= -f2)
if [ "$time" -gt "1705705200" ]; then
killall -q -SIGUSR1 majestic
- sleep 2
else
killall -q majestic
fi
+ sleep 1
echo "OK"
for proc in crond klogd ntpd rngd syslogd; do
diff --git a/general/scripts/clone_hisi2goke.sh b/general/scripts/clone_hisi2goke.sh
index a93dc21c..7c37363f 100755
--- a/general/scripts/clone_hisi2goke.sh
+++ b/general/scripts/clone_hisi2goke.sh
@@ -1,14 +1,13 @@
-#!/usr/bin/env bash
+#!/bin/bash
if [ ! $# -eq 2 ]; then
- echo "Usage: $0 <hi3516dv200.generic.config> <gk7605v100.generic.config>"
+ echo "Usage: $0 <hi3516dv200.generic.config> <gk7605v100.generic.config>"
fi
INPUT=$1
OUTPUT=$2
cp $INPUT $OUTPUT
-
sed -i 's/HISI_BVT/GOKE/g' $OUTPUT
sed -i 's/Hisilicon BVT/Goke/g' $OUTPUT
sed -i 's/HISILICON/GOKE/g' $OUTPUT
diff --git a/general/scripts/rootfs_script.sh b/general/scripts/rootfs_script.sh
index abe8cc6a..510795da 100755
--- a/general/scripts/rootfs_script.sh
+++ b/general/scripts/rootfs_script.sh
@@ -1,5 +1,4 @@
#!/bin/bash
-
DATE=$(date +%y.%m.%d)
FILE=${TARGET_DIR}/usr/lib/os-release
diff --git a/general/scripts/show_toolchains.sh b/general/scripts/show_toolchains.sh
index 57b8bf8e..1a6e1eeb 100755
--- a/general/scripts/show_toolchains.sh
+++ b/general/scripts/show_toolchains.sh
@@ -1,5 +1,4 @@
-#!/usr/bin/env bash
-
+#!/bin/bash
shopt -s nullglob
toolchain_by_config() {
diff --git a/general/scripts/sync_goke.sh b/general/scripts/sync_goke.sh
index 0ebbe1a7..8aa505fb 100755
--- a/general/scripts/sync_goke.sh
+++ b/general/scripts/sync_goke.sh
@@ -1,5 +1,4 @@
-#!/usr/bin/env bash
-
+#!/bin/bash
INDIR=br-ext-chip-hisilicon/board/hi3516ev200/kernel
OUTDIR=br-ext-chip-goke/board/gk7205v200/kernel