Simplify script

This commit is contained in:
Aleksey Samoilov 2023-02-17 22:27:23 +04:00
parent ba1ac97f57
commit c2fce029fc

View file

@ -14,7 +14,10 @@ if [ -n "$1" ]; then
else else
CONFIG_FILE="etc/terraform.conf" CONFIG_FILE="etc/terraform.conf"
fi fi
BASE_DIR="$PWD" BASE_DIR="$PWD"
TMP_DIR="$BASE_DIR/tmp"
BUILDS_DIR="$BASE_DIR/builds"
source "$BASE_DIR"/"$CONFIG_FILE" source "$BASE_DIR"/"$CONFIG_FILE"
echo -e " echo -e "
@ -29,11 +32,9 @@ dist="$(lsb_release -i -s)"
if [ $dist == "Debian" ]; then if [ $dist == "Debian" ]; then
apt-get install -y binutils zstd live-build apt-get install -y binutils zstd live-build
dpkg -i ./debs/ubuntu-keyring*.deb dpkg -i ./debs/ubuntu-keyring*.deb
elif [ $dist == "Ubuntu" ]; then else
apt-get install -y binutils zstd apt-get install -y binutils zstd
dpkg -i ./debs/*.deb dpkg -i ./debs/*.deb
else
echo "E: Unsupported distribution for building"
fi fi
ln -sfn /usr/share/debootstrap/scripts/gutsy /usr/share/debootstrap/scripts/lunar ln -sfn /usr/share/debootstrap/scripts/gutsy /usr/share/debootstrap/scripts/lunar
@ -41,8 +42,14 @@ ln -sfn /usr/share/debootstrap/scripts/gutsy /usr/share/debootstrap/scripts/luna
build () { build () {
BUILD_ARCH="$1" BUILD_ARCH="$1"
mkdir -p "$BASE_DIR/tmp/$BUILD_ARCH" if [ -d "$TMP_DIR" ]; then
cd "$BASE_DIR/tmp/$BUILD_ARCH" || exit rm -rf $TMP_DIR
mkdir -p "$TMP_DIR/$BUILD_ARCH"
else
mkdir -p "$TMP_DIR/$BUILD_ARCH"
fi
cd "$TMP_DIR/$BUILD_ARCH" || exit
# remove old configs and copy over new # remove old configs and copy over new
rm -rf config auto rm -rf config auto
@ -81,7 +88,7 @@ build () {
" "
YYYYMMDD="$(date +%Y%m%d%H%M)" YYYYMMDD="$(date +%Y%m%d%H%M)"
OUTPUT_DIR="$BASE_DIR/builds/$BUILD_ARCH" OUTPUT_DIR="$BUILDS_DIR/$BUILD_ARCH"
mkdir -p "$OUTPUT_DIR" mkdir -p "$OUTPUT_DIR"
if [ "$CHANNEL" == dev ]; then if [ "$CHANNEL" == dev ]; then
FNAME="ubuntusway-$VERSION-$CHANNEL-$YYYYMMDD-$OUTPUT_SUFFIX-$ARCH" FNAME="ubuntusway-$VERSION-$CHANNEL-$YYYYMMDD-$OUTPUT_SUFFIX-$ARCH"
@ -90,14 +97,14 @@ build () {
else else
echo -e "Error: invalid channel name!" echo -e "Error: invalid channel name!"
fi fi
mv "$BASE_DIR/tmp/$BUILD_ARCH/live-image-$BUILD_ARCH.hybrid.iso" "$OUTPUT_DIR/${FNAME}.iso" mv "$TMP_DIR/$BUILD_ARCH/live-image-$BUILD_ARCH.hybrid.iso" "$OUTPUT_DIR/${FNAME}.iso"
md5sum "$OUTPUT_DIR/${FNAME}.iso" > "$OUTPUT_DIR/${FNAME}.md5.txt" md5sum "$OUTPUT_DIR/${FNAME}.iso" > "$OUTPUT_DIR/${FNAME}.md5.txt"
sha256sum "$OUTPUT_DIR/${FNAME}.iso" > "$OUTPUT_DIR/${FNAME}.sha256.txt" sha256sum "$OUTPUT_DIR/${FNAME}.iso" > "$OUTPUT_DIR/${FNAME}.sha256.txt"
} }
# remove old builds before creating new ones # remove old builds before creating new ones
rm -rf "$BASE_DIR"/builds rm -rf "$BUILDS_DIR"
build "$ARCH" build "$ARCH"