From 2dfe8c48fc08505317935bbd80ecec97f6f0aa0f Mon Sep 17 00:00:00 2001 From: electron271 <66094410+electron271@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:28:39 -0500 Subject: [PATCH 1/2] move scripts to scripts/ directory --- .github/workflows/binary.yml | 4 ++-- README.md | 2 +- compress-diskimg.sh => scripts/compress-diskimg.sh | 4 ++++ configure.sh => scripts/configure.sh | 0 4 files changed, 7 insertions(+), 3 deletions(-) rename compress-diskimg.sh => scripts/compress-diskimg.sh (96%) rename configure.sh => scripts/configure.sh (100%) diff --git a/.github/workflows/binary.yml b/.github/workflows/binary.yml index ca3d986..68323f7 100644 --- a/.github/workflows/binary.yml +++ b/.github/workflows/binary.yml @@ -25,11 +25,11 @@ jobs: - name: Add nightly-x86_64 run: rustup component add rust-src --toolchain nightly-x86_64-unknown-linux-gnu - name: Install deps - run: ./configure.sh + run: ./scripts/configure.sh #- name: Build # run: cargo build --verbose --release - name: Compress Diskimg - run: ./compress-diskimg.sh + run: ./scripts/compress-diskimg.sh #- name: Generate SHA256 sum # run: sha256sum target/x86_64-arch/debug/bootimage-popcorn.bin.zst > sha256sum.txt - name: Send to Discord diff --git a/README.md b/README.md index 72cf13c..d482202 100644 --- a/README.md +++ b/README.md @@ -49,7 +49,7 @@ We welcome contributions from developers, designers, and enthusiasts who share o ### Building and Running Before building the kernel, you must first install the required dependencies. To install the dependencies, run the following command: -```./configure.sh``` +```./scripts/configure.sh``` To build the kernel, run the following command: ```cargo bootimage``` diff --git a/compress-diskimg.sh b/scripts/compress-diskimg.sh similarity index 96% rename from compress-diskimg.sh rename to scripts/compress-diskimg.sh index 61cb158..3b5ae0b 100755 --- a/compress-diskimg.sh +++ b/scripts/compress-diskimg.sh @@ -2,6 +2,9 @@ # compresses the popcorn disk image with zstd # using compression level 19 +# workaround for this now being in the scripts directory +cd .. + # check if `zstd` is present if ! command -v zstd; then echo -e "\e[1;31merror:\e[0m command \"zstd\" is not present" 1>&2; @@ -28,6 +31,7 @@ echo ""; echo -e "\e[1m[INFO]\e[0m building disk image..."; echo -e "\e[1m[\e[1;36mEXEC\e[0m\e[1m]\e[0m cargo -v bootimage -v"; + # build the bootimage with verbose output cargo -v bootimage -v; diff --git a/configure.sh b/scripts/configure.sh similarity index 100% rename from configure.sh rename to scripts/configure.sh From 8ed3aa7d186ec119cf994a304851ca917e24f06f Mon Sep 17 00:00:00 2001 From: electron271 <66094410+electron271@users.noreply.github.com> Date: Mon, 23 Oct 2023 15:31:24 -0500 Subject: [PATCH 2/2] maybe this will work --- scripts/compress-diskimg.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/compress-diskimg.sh b/scripts/compress-diskimg.sh index 3b5ae0b..893e89c 100755 --- a/scripts/compress-diskimg.sh +++ b/scripts/compress-diskimg.sh @@ -2,9 +2,6 @@ # compresses the popcorn disk image with zstd # using compression level 19 -# workaround for this now being in the scripts directory -cd .. - # check if `zstd` is present if ! command -v zstd; then echo -e "\e[1;31merror:\e[0m command \"zstd\" is not present" 1>&2;