small touches

Author: solcloud

.config.sh

@@ -30,14 +30,13 @@ export MOUNT_PATH=$STORAGE/temp/mnt/nice_root
 export DISK_FILE="$STORAGE/sda.img"
 export NICE_HAS_PRIMARY_DISK="1"
 export NICE_HAS_SECONDARY_DISK="0"
-export LINUX_COPY_SRC_TO_TARGET="0"
 export INITRAMFS_BUILD=$BUILDS/initramfs
 export SUPPORT_BUILD=$BUILDS/support
 
 # Find out preset
 NICE_PRESET_ROOT=${NICE_PRESET_ROOT:-"$BASE/presets"}
 if [ -z $NICE_PRESET ]; then
-    echo "You need to specify preset from $NICE_PRESET_ROOT folder"
+    echo "You need to specify preset from '$NICE_PRESET_ROOT' folder"
     echo "use 'export NICE_PRESET=minimal' for example"
     exit 1
 fi

distro_extractor/artix/install_vm.sh

@@ -21,10 +21,7 @@ pacman-key --populate archlinux
 
 
 basestrap /mnt $(cat /tmp/packages.arch.txt | xargs)
-artix-chroot /mnt /bin/sh -c '
-echo "Cleaning installation"
 
-'
 
 sync
 umount /mnt/

scripts/extract.sh

@@ -18,6 +18,9 @@ fi
 {
     echo "Copying files from '$VM_MOUNT_ROOT' to '$TARGET'"
     notify 'We need sudo for copying'
+    if ! sudo ls "$VM_MOUNT_ROOT/usr/" 2> /dev/null; then
+        dd "Cannot read '$VM_MOUNT_ROOT/usr/', extract failed?"
+    fi
 
     echo "Copying: usr/"
     rm -rf "$TARGET/usr/"

scripts/extract_from_vm.sh

@@ -6,9 +6,9 @@ function boot_info() {
     echo -n ""
 }
 source "$BASE/distro_extractor/$DISTRO/inc.sh" || dd "File '$BASE/distro_extractor/$DISTRO/inc.sh' cannot be sourced"
+[ -r "$NICE_PRESET_PATH/packages.${PM}.txt" ] || dd "No packages list for your preset and $DISTRO found ($NICE_PRESET_PATH/packages.${PM}.txt)"
 
 function ssh_install() {
-    [ -r "$NICE_PRESET_PATH/packages.${PM}.txt" ] || dd "No packages list for your preset and $DISTRO found ($NICE_PRESET_PATH/packages.${PM}.txt)"
     echo "NICE_ARCH=$NICE_ARCH" > "$OPT/nice_os_settings.sh"
     [ -n "$VM_PASS" ] && echo "For password prompt write $VM_PASS" || true
     sudoCommand=''

scripts/extract_signpost.sh

@@ -5,7 +5,7 @@ source ./.config.sh || exit 1
 
 function requires_distro_variable() {
     if [ -z "$DISTRO" ]; then
-        echo "You need to specify extracting distribution from $BASE/distro_extractor, use one of"
+        echo "You need to specify extracting distribution from '$BASE/distro_extractor', use one of"
         ls -I 'README.md' "$BASE/distro_extractor"
         dd "use 'export DISTRO=artix' for example"
     fi