From 497eb3dd7ba54db017ae8bb0382f7d395c555109 Mon Sep 17 00:00:00 2001
From: syui <syui@syui.ai>
Date: Tue, 13 Feb 2024 10:15:11 +0900
Subject: [PATCH] fix

---
 build.zsh         | 33 +++++++++++++++++----------------
 scpt/gp-pages.zsh |  3 +++
 2 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/build.zsh b/build.zsh
index 0b13000..16298e6 100755
--- a/build.zsh
+++ b/build.zsh
@@ -1,17 +1,18 @@
 #!/bin/zsh
-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 -C ./root.x86_64 -c . | docker import - syui/aios
-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
+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/
diff --git a/scpt/gp-pages.zsh b/scpt/gp-pages.zsh
index a116ba6..29a50f4 100755
--- a/scpt/gp-pages.zsh
+++ b/scpt/gp-pages.zsh
@@ -66,3 +66,6 @@ yml_b=`cat $dd/cfg/build.sh`
 echo $yml_a
 echo $yml_b
 echo $yml_c
+
+echo '#!/bin/zsh' >! $dd/build.zsh
+echo $yml_b >> $dd/build.zsh