From 2357e08891cb990184d75a3cc2bf5da705eb738b Mon Sep 17 00:00:00 2001 From: syui Date: Tue, 13 Feb 2024 10:21:23 +0900 Subject: [PATCH] fix --- build.zsh | 32 ++++++++++++++++---------------- cfg/build.sh | 32 ++++++++++++++++---------------- scpt/gh-actions.zsh | 2 +- 3 files changed, 33 insertions(+), 33 deletions(-) diff --git a/build.zsh b/build.zsh index 16298e6..4b809b0 100755 --- a/build.zsh +++ b/build.zsh @@ -1,18 +1,18 @@ #!/bin/zsh - pacman -Syuu --noconfirm base-devel archiso docker git - git clone https://gitlab.archlinux.org/archlinux/archiso - cp -rf ./cfg/profiledef.sh /usr/share/archiso/configs/releng/ - cp -rf ./cfg/profiledef.sh ./archiso/configs/releng/profiledef.sh - cp -rf ./cfg/profiledef.sh ./archiso/configs/baseline/profiledef.sh - cp -rf ./scpt/mkarchiso ./archiso/archiso/mkarchiso - ./archiso/archiso/mkarchiso -v -o ./ ./archiso/configs/releng/ - tar xf aios-bootstrap*.tar.gz - echo -e 'Server = http://mirrors.cat.net/archlinux/$repo/os/$arch +pacman -Syuu --noconfirm base-devel archiso docker git +git clone https://gitlab.archlinux.org/archlinux/archiso +cp -rf ./cfg/profiledef.sh /usr/share/archiso/configs/releng/ +cp -rf ./cfg/profiledef.sh ./archiso/configs/releng/profiledef.sh +cp -rf ./cfg/profiledef.sh ./archiso/configs/baseline/profiledef.sh +cp -rf ./scpt/mkarchiso ./archiso/archiso/mkarchiso +./archiso/archiso/mkarchiso -v -o ./ ./archiso/configs/releng/ +tar xf aios-bootstrap*.tar.gz +echo -e 'Server = http://mirrors.cat.net/archlinux/$repo/os/$arch Server = https://geo.mirror.pkgbuild.com/$repo/os/$arch' >> ./root.x86_64/etc/pacman.d/mirrorlist - sed -i s/CheckSpace/#CheckeSpace/ root.x86_64/etc/pacman.conf - arch-chroot root.x86_64 /bin/sh -c 'pacman-key --init' - arch-chroot root.x86_64 /bin/sh -c 'pacman-key --populate archlinux' - arch-chroot root.x86_64 /bin/sh -c 'pacman -Syu --noconfirm base base-devel linux vim git zsh rust openssh openssl jq' - arch-chroot root.x86_64 /bin/sh -c 'chsh -s /bin/zsh' - arch-chroot root.x86_64 /bin/sh -c 'git clone https://git.syui.ai/ai/bot && cd bot && cargo build && cp -rf ./target/debug/ai /bin/ && ai ai' - tar -zcvf aios-bootstrap.tar.gz root.x86_64/ +sed -i s/CheckSpace/#CheckeSpace/ root.x86_64/etc/pacman.conf +arch-chroot root.x86_64 /bin/sh -c 'pacman-key --init' +arch-chroot root.x86_64 /bin/sh -c 'pacman-key --populate archlinux' +arch-chroot root.x86_64 /bin/sh -c 'pacman -Syu --noconfirm base base-devel linux vim git zsh rust openssh openssl jq' +arch-chroot root.x86_64 /bin/sh -c 'chsh -s /bin/zsh' +arch-chroot root.x86_64 /bin/sh -c 'git clone https://git.syui.ai/ai/bot && cd bot && cargo build && cp -rf ./target/debug/ai /bin/ && ai ai' +tar -zcvf aios-bootstrap.tar.gz root.x86_64/ diff --git a/cfg/build.sh b/cfg/build.sh index d76d073..00242c0 100644 --- a/cfg/build.sh +++ b/cfg/build.sh @@ -1,16 +1,16 @@ - pacman -Syuu --noconfirm base-devel archiso docker git - git clone https://gitlab.archlinux.org/archlinux/archiso - cp -rf ./cfg/profiledef.sh /usr/share/archiso/configs/releng/ - cp -rf ./cfg/profiledef.sh ./archiso/configs/releng/profiledef.sh - cp -rf ./cfg/profiledef.sh ./archiso/configs/baseline/profiledef.sh - cp -rf ./scpt/mkarchiso ./archiso/archiso/mkarchiso - ./archiso/archiso/mkarchiso -v -o ./ ./archiso/configs/releng/ - tar xf aios-bootstrap*.tar.gz - echo -e 'Server = http://mirrors.cat.net/archlinux/$repo/os/$arch\nServer = https://geo.mirror.pkgbuild.com/$repo/os/$arch' >> ./root.x86_64/etc/pacman.d/mirrorlist - sed -i s/CheckSpace/#CheckeSpace/ root.x86_64/etc/pacman.conf - arch-chroot root.x86_64 /bin/sh -c 'pacman-key --init' - arch-chroot root.x86_64 /bin/sh -c 'pacman-key --populate archlinux' - arch-chroot root.x86_64 /bin/sh -c 'pacman -Syu --noconfirm base base-devel linux vim git zsh rust openssh openssl jq' - arch-chroot root.x86_64 /bin/sh -c 'chsh -s /bin/zsh' - arch-chroot root.x86_64 /bin/sh -c 'git clone https://git.syui.ai/ai/bot && cd bot && cargo build && cp -rf ./target/debug/ai /bin/ && ai ai' - tar -zcvf aios-bootstrap.tar.gz root.x86_64/ +pacman -Syuu --noconfirm base-devel archiso docker git +git clone https://gitlab.archlinux.org/archlinux/archiso +cp -rf ./cfg/profiledef.sh /usr/share/archiso/configs/releng/ +cp -rf ./cfg/profiledef.sh ./archiso/configs/releng/profiledef.sh +cp -rf ./cfg/profiledef.sh ./archiso/configs/baseline/profiledef.sh +cp -rf ./scpt/mkarchiso ./archiso/archiso/mkarchiso +./archiso/archiso/mkarchiso -v -o ./ ./archiso/configs/releng/ +tar xf aios-bootstrap*.tar.gz +echo -e 'Server = http://mirrors.cat.net/archlinux/$repo/os/$arch\nServer = https://geo.mirror.pkgbuild.com/$repo/os/$arch' >> ./root.x86_64/etc/pacman.d/mirrorlist +sed -i s/CheckSpace/#CheckeSpace/ root.x86_64/etc/pacman.conf +arch-chroot root.x86_64 /bin/sh -c 'pacman-key --init' +arch-chroot root.x86_64 /bin/sh -c 'pacman-key --populate archlinux' +arch-chroot root.x86_64 /bin/sh -c 'pacman -Syu --noconfirm base base-devel linux vim git zsh rust openssh openssl jq' +arch-chroot root.x86_64 /bin/sh -c 'chsh -s /bin/zsh' +arch-chroot root.x86_64 /bin/sh -c 'git clone https://git.syui.ai/ai/bot && cd bot && cargo build && cp -rf ./target/debug/ai /bin/ && ai ai' +tar -zcvf aios-bootstrap.tar.gz root.x86_64/ diff --git a/scpt/gh-actions.zsh b/scpt/gh-actions.zsh index 29a50f4..6578172 100755 --- a/scpt/gh-actions.zsh +++ b/scpt/gh-actions.zsh @@ -64,7 +64,7 @@ yml_c=' yml_b=`cat $dd/cfg/build.sh` echo $yml_a -echo $yml_b +echo $yml_b|sed 's/^/ /g' echo $yml_c echo '#!/bin/zsh' >! $dd/build.zsh