root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

small fixes detected by shellcheck

Browse source
This commit is contained in:
Tobias Powalowski 2022-02-08 17:20:48 +01:00
parent d0728e6277
commit ddf0140794
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
usr/lib/archboot/release_functions
View file

@ -20,7 +20,7 @@ _create_iso() {
mkdir -p "${1}"
cd "${1}" || exit 1
# create container
archboot-${_RUNNING_ARCH}-create-container.sh "${_W_DIR}" -cc -cp || exit 1
archboot-"${_RUNNING_ARCH}"-create-container.sh "${_W_DIR}" -cc -cp || exit 1
# generate tarball in container, umount tmp it's a tmpfs and weird things could happen then
echo "Generate ISO ..."
# generate iso in container
@ -39,7 +39,7 @@ _create_iso() {
echo "Homepage: https://wiki.archlinux.org/title/Archboot";\
echo "Architecture: ${_RUNNING_ARCH}";\
echo "RAM requirement to boot: 1152 MB or greater";\
echo "Archboot:$(systemd-nspawn -q -D "${_W_DIR}" pacman -Qi ${_ARCHBOOT} | grep Version | cut -d ":" -f2 | sed -e "s/\r//g")";\
echo "Archboot:$(systemd-nspawn -q -D "${_W_DIR}" pacman -Qi "${_ARCHBOOT}" | grep Version | cut -d ":" -f2 | sed -e "s/\r//g")";\
echo "Kernel:$(systemd-nspawn -q -D "${_W_DIR}" pacman -Qi linux | grep Version | cut -d ":" -f2 | sed -e "s/\r//g")";\
echo "Pacman:$(systemd-nspawn -q -D "${_W_DIR}" pacman -Qi pacman | grep Version | cut -d ":" -f2 | sed -e "s/\r//g")";\
echo "Systemd:$(systemd-nspawn -q -D "${_W_DIR}" pacman -Qi systemd | grep Version | cut -d ":" -f2 | sed -e "s/\r//g")") >>Release.txt

2
usr/lib/archboot/server_functions
View file

@ -1,7 +1,7 @@
#!/bin/bash
_DIRECTORY="$(date +%Y.%m)"
_ISOHOME="/home/tobias/Arch/iso/${_ARCH}"
_BUILDDIR="$(mktemp -d ${_ISOHOME}/server-release.XXX)"
_BUILDDIR="$(mktemp -d "${_ISOHOME}"/server-release.XXX)"
_SERVER="pkgbuild.com"
_SERVER_HOME="/home/tpowa/"
_SERVER_DIR="/home/tpowa/public_html/archboot-images"