diff --git a/make.sh b/make.sh index 7e8ff74..6c95e88 100755 --- a/make.sh +++ b/make.sh @@ -58,11 +58,11 @@ _config() lb clean lb clean --cache + #--apt-http-proxy "http://192.168.110.1:3142" \ lb config noauto \ --architectures amd64 \ --distribution bullseye \ --binary-images iso-hybrid \ - --apt-http-proxy "http://192.168.110.1:3142" \ --archive-areas "main contrib non-free" \ --debian-installer none \ --apt-recommends false \ @@ -81,6 +81,15 @@ _config() ln -sr $config/package-lists/$file.list.chroot $build/config/package-lists/$file.list.chroot done + if [ ! -f "$iso" ];then + printf "\e[96mCreate ISO directory\e[0m\n" + install -d -m 0755 -o $SUDO_UID -g $SUDO_GID $iso + fi + + out="$iso/$type" + + install -d -m 0755 -o $SUDO_UID -g $SUDO_GID $out + } _build() @@ -123,10 +132,6 @@ _create_squashfs() printf "\e[96mCopy filesystem\e[0m\n" - out="$iso/$type" - - install -d -m 0755 -o $SUDO_UID -g $SUDO_GID $out - cp $build/binary/live/{initrd.img,vmlinuz,filesystem.squashfs} $out/ chown $SUDO_UID:$SUDO_GID $out/{initrd.img,vmlinuz,filesystem.squashfs} @@ -141,10 +146,6 @@ _create_iso() printf "\e[96mCopy ISO\e[0m\n" - out="$iso/$type" - - install -d -m 0755 -o $SUDO_UID -g $SUDO_GID $out - cp $build/live-image-amd64.hybrid.iso $out/live-${type}-image.iso chown $SUDO_UID:$SUDO_GID $out/live-${type}-image.iso