Mirror/pmbootstrap
1
0
Fork 1
mirror of https://gitlab.postmarketos.org/postmarketOS/pmbootstrap.git synced 2025-07-12 10:59:49 +03:00
Code Issues Wiki Activity

pmb/data/merge-usr: deduplicate code (MR 2388)

Browse source 
Create a common merge() function that can be adjusted in the next patch,
because the logic for merging needs to be more complicated now.
This commit is contained in:
Oliver Smith 2024-09-17 00:57:17 +02:00
parent f38d525538
commit 9a50d3398d
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
2 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.shellcheckrc Normal file
View file

@ -0,0 +1,3 @@
# SC3043: "In POSIX sh, 'local' is undefined" - busybox sh and pretty much all
# other shells can handle it though and Alpine uses it too in lots of scripts.
disable=SC3043

28
pmb/data/merge-usr.sh
View file

@ -17,22 +17,16 @@ if [ -L "$CHROOT"/bin ]; then
exit 1
fi
# /bin -> /usr/bin
mv "$CHROOT"/bin/* "$CHROOT"/usr/bin/
rmdir "$CHROOT"/bin
ln -s usr/bin "$CHROOT"/bin
merge() {
local src="$1"
local dest="$2"
# /sbin -> /usr/bin
mv "$CHROOT"/sbin/* "$CHROOT"/usr/bin/
rmdir "$CHROOT"/sbin
ln -s usr/bin "$CHROOT"/sbin
mv "$CHROOT/$src/"* "$CHROOT/$dest/"
rmdir "$CHROOT/$src"
ln -s "/$dest" "$CHROOT/$src"
}
# /lib -> /usr/lib
mv "$CHROOT"/lib/* "$CHROOT"/usr/lib/
rmdir "$CHROOT"/lib
ln -s usr/lib "$CHROOT"/lib
# /usr/sbin -> /usr/bin
mv "$CHROOT"/usr/sbin/* "$CHROOT"/usr/bin/
rmdir "$CHROOT"/usr/sbin
ln -s bin "$CHROOT"/usr/sbin
merge bin usr/bin
merge sbin usr/bin
merge lib usr/lib
merge usr/sbin usr/bin