Minor tweaks to improve outputs from Bash scripts (#197)
* replaced ugly tar output with simple messages * replaced ugly tar extraction output * Update mynode-local-upgrade * Suppress the null byte warning
This commit is contained in:
parent
32ac3ed159
commit
7deec49409
|
@ -1,12 +1,14 @@
|
|||
#!/bin/bash
|
||||
|
||||
for i in 'rock64' 'rockpro64' 'raspi3' 'raspi4' 'debian'; do
|
||||
echo Creating root file system for $i
|
||||
mkdir -p out/rootfs_$i/
|
||||
rsync -r -u rootfs/standard/* out/rootfs_$i/
|
||||
rsync -r -u rootfs/$i/* out/rootfs_$i/
|
||||
rsync -r -u CHANGELOG out/rootfs_$i/usr/share/mynode/changelog
|
||||
cp -f setup/setup_device.sh out/setup_device.sh
|
||||
cp -f setup/setup_device.sh out/setup_device.sh
|
||||
|
||||
rm -f out/mynode_rootfs_$i.tar.gz
|
||||
tar -zcvf out/mynode_rootfs_$i.tar.gz ./out/rootfs_$i/*
|
||||
tar -zcf out/mynode_rootfs_$i.tar.gz out/rootfs_$i/*
|
||||
done
|
||||
echo Done!
|
||||
|
|
|
@ -25,7 +25,9 @@ wget http://${ip_address}:8000/mynode_rootfs_${DEVICE_TYPE}.tar.gz -O /tmp/mynod
|
|||
# Extract on top of mynode fs
|
||||
rm -rf /tmp/rootfs/
|
||||
mkdir -p /tmp/rootfs/
|
||||
tar -xvf /tmp/mynode_rootfs_${DEVICE_TYPE}.tar.gz -C /tmp/rootfs/
|
||||
echo -n "Extracting rootfs TAR for ${DEVICE_TYPE}... "
|
||||
tar -xf /tmp/mynode_rootfs_${DEVICE_TYPE}.tar.gz -C /tmp/rootfs/
|
||||
echo Done!
|
||||
|
||||
# Install files
|
||||
if [ $IS_X86 = 1 ]; then
|
||||
|
@ -65,4 +67,4 @@ else
|
|||
exit 1
|
||||
fi
|
||||
reboot
|
||||
fi
|
||||
fi
|
||||
|
|
|
@ -9,7 +9,7 @@ IS_RASPI3=0
|
|||
IS_RASPI4=0
|
||||
IS_X86=0
|
||||
DEVICE_TYPE="unknown"
|
||||
MODEL=$(cat /proc/device-tree/model) || MODEL="unknown"
|
||||
MODEL=$(tr -d '\0' < /proc/device-tree/model) || MODEL="unknown"
|
||||
uname -a | grep amd64 && IS_X86=1 || true
|
||||
if [[ $MODEL == *"Rock64"* ]]; then
|
||||
IS_ARMBIAN=1
|
||||
|
|
Loading…
Reference in New Issue
Block a user