buxfixes

.build_dir

@@ -1 +1 @@
-/built/test
+/build/bionic

.script_version

@@ -1 +1 @@
-5
+13

install

@@ -6,7 +6,7 @@ set -u          # treat unset variable as error
 
 SCRIPT_DIR="$(dirname "$(readlink -f "$0")")"
 PARENT_DIR="$(dirname "$SCRIPT_DIR")"
-ISO_DIR="$(dirname "$SCRIPT_DIR")"
+ISO_DIR="$(dirname "$SCRIPT_DIR")"/iso
 #ISO_DIR=$SCRIPT_DIR/iso
 #ISO_DIR=/build/nfs/iso
 

linux-live/bootfiles/boot/grub/grub.cfg

@@ -1,5 +1,5 @@
 set default="0"
-set timeout="20"
+set timeout="10"
 set hidden_timeout_quiet=false
 set gfxmode=auto
 insmod efi_gop

linux-live/config

@@ -21,7 +21,7 @@ SYSTEMNAME="MiniOS"
 SYSTEMVER="2021"
 
 #
-DISTRIBUTION="focal"
+DISTRIBUTION="bionic"
 
 #
 DISTRIBUTION_ARCH="amd64"

linux-live/minioslib

@@ -26,7 +26,7 @@ function common_variables() {
 
 	# if ="1", creates backup in parent folder
 	# если ="1", создаёт резервную копию в родительской папке
-	CREATE_BACKUP="1"
+	CREATE_BACKUP="0"
 
 	DEBIAN_FRONTEND_TYPE="noninteractive"
 	#DEBIAN_FRONTEND_TYPE="ncurses"
@@ -367,8 +367,8 @@ function remove_log_file() {
 }
 
 function create_backup() {
-	echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
 	if [ $CREATE_BACKUP = "1" ]; then
+		echo -e "=====> the ${CYAN}${FUNCNAME[0]}${ENDCOLOUR} function is executing ..."
 		if [ ! -f $SCRIPT_DIR/.script_version ]; then
 			cat "1" >$SCRIPT_DIR/.script_version >>$OUTPUT 2>&1
 			chmod 644 $SCRIPT_DIR/.script_version >>$OUTPUT 2>&1
@@ -529,11 +529,12 @@ function build_iso() {
 		mkdir -p $ISO_DIR
 	fi
 
+	mkdir -p $ISO_DIR >>$OUTPUT 2>&1
 	VER=$SYSTEMVER
 	DATE=$(date +%Y%m%d_%H%M)
 
 	DIR=$BUILD_DIR$LIVEKITDATA
-	ISO=$ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$DATE.iso
+	ISO=$ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$COMP_TYPE-$DATE.iso
 
 	B="-b boot/syslinux/isolinux.bin -c boot/syslinux/boot.cat"
 	C="-no-emul-boot -boot-load-size 4 -boot-info-table -eltorito-alt-boot"
@@ -573,7 +574,7 @@ function build_iso() {
 		fi
 	fi
 	if [ $BUILD_TEST_ISO="1" ]; then
-		if cp -f $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$DATE.iso $ISO_DIR/$LIVEKITNAME.iso; then
+		if cp -f $ISO_DIR/$LIVEKITNAME-$DISTRIBUTION-$DISTRIBUTION_ARCH-$COMP_TYPE-$DATE.iso $ISO_DIR/$LIVEKITNAME.iso; then
 			echo ">>> $ISO_DIR/$LIVEKITNAME.iso created"
 		fi
 	fi