OpenIPC
/
firmware
mirror of https://github.com/OpenIPC/firmware.git
1
0
Fork 0
Code Activity

Make suggested bash changes [ ! -z something ] with [ -n something ]

pull/445/head
Dmitry Ilyin 2022-09-09 11:06:32 +03:00
parent 4cc0413378
commit 7c80e79b7b
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/show_toolchains.sh
View File

@ -7,7 +7,7 @@ toolchain_by_config() {
FMT=$2 FMT=$2
BR2_VER=$(grep BR2_DEFAULT_KERNEL_VERSION $CF) BR2_VER=$(grep BR2_DEFAULT_KERNEL_VERSION $CF)
if [ ! -z $BR2_VER ]; then if [ -n "$BR2_VER" ]; then
VENDOR=$(echo $CF | cut -d - -f 4 | cut -d / -f 1 | sed -r 's/\<./\U&/g') VENDOR=$(echo $CF | cut -d - -f 4 | cut -d / -f 1 | sed -r 's/\<./\U&/g')
KVER=$(echo $BR2_VER | cut -d \" -f 2 | awk -F . '{printf "%s_%s", $1, $2}') KVER=$(echo $BR2_VER | cut -d \" -f 2 | awk -F . '{printf "%s_%s", $1, $2}')
GCC_VER=$(sed -rn "s/^BR2_GCC_VERSION_([0-9]*)_X=y/\1/p" $CF) GCC_VER=$(sed -rn "s/^BR2_GCC_VERSION_([0-9]*)_X=y/\1/p" $CF)
@ -26,10 +26,10 @@ toolchain_by_config() {
ARCH=$(sed -rn "s/^BR2_(mips_[a-z]*)=y/\1/p" $CF) ARCH=$(sed -rn "s/^BR2_(mips_[a-z]*)=y/\1/p" $CF)
else else
THUMB=$(sed -rn "s/^BR2_ARM_INSTRUCTIONS_(THUMB2)=y/\1/p" $CF) THUMB=$(sed -rn "s/^BR2_ARM_INSTRUCTIONS_(THUMB2)=y/\1/p" $CF)
if [ ! -z "$THUMB" ]; then if [ -n "$THUMB" ]; then
ARCH="${ARCH}_${THUMB,,}" ARCH="${ARCH}_${THUMB,,}"
fi fi
if [ ! -z "$HF" ]; then if [ -n "$HF" ]; then
ARCH="${ARCH}_${HF}" ARCH="${ARCH}_${HF}"
fi fi
fi fi
@ -45,7 +45,7 @@ toolchain_by_config() {
echo $ARCH $GCC_VER $LIBC $KVER echo $ARCH $GCC_VER $LIBC $KVER
;; ;;
*) *)
if [ ! -z "$2" ]; then if [ -n "$2" ]; then
BR_DIR=buildroot-$2 BR_DIR=buildroot-$2
GCC_VER=$(sed -rn \ GCC_VER=$(sed -rn \
"s/^\s+default\s+\"([0-9.]+)\"\s+if BR2_GCC_VERSION_${GCC_VER}_X/\1/p" \ "s/^\s+default\s+\"([0-9.]+)\"\s+if BR2_GCC_VERSION_${GCC_VER}_X/\1/p" \