common: move PROFILESDIR and VMDIR defaults from build-distro

parent 76b02727
...@@ -11,14 +11,6 @@ NETWORK=false ...@@ -11,14 +11,6 @@ NETWORK=false
# shellcheck disable=SC1091 # shellcheck disable=SC1091
. "$(dirname "$0")/common" . "$(dirname "$0")/common"
if [ -z "$VMDIR" ]; then
VMDIR="/var/ftp/pvt/ISO/testing/template/iso"
fi
if [ -z "$PROFILESDIR" ]; then
PROFILESDIR="$BUILDERDIR/mkimage-profiles"
fi
print_build_info() { print_build_info() {
echo "____________________" echo "____________________"
print_blue "VMDIR: $VMDIR" print_blue "VMDIR: $VMDIR"
...@@ -40,7 +32,7 @@ cleartmp() { ...@@ -40,7 +32,7 @@ cleartmp() {
[ "$CLEAN" == true ] || return [ "$CLEAN" == true ] || return
echo "____________________" echo "____________________"
PROFILESDIR=$PROFILESDIR "$BUILDERDIR"/bin/cleartmp -i "$BUILDERDIR"/bin/cleartmp -i
# shellcheck disable=SC2012 # shellcheck disable=SC2012
# Удаляем все, кроме самого нового # Удаляем все, кроме самого нового
[ "$VER" == "devel" ] && ls -t "$VMDIR"/ximper-"$desktop_env""$iso_suffix"-devel-*-x86_64.iso | tail -n +2 | xargs -I {} rm -v -- {} [ "$VER" == "devel" ] && ls -t "$VMDIR"/ximper-"$desktop_env""$iso_suffix"-devel-*-x86_64.iso | tail -n +2 | xargs -I {} rm -v -- {}
......
...@@ -2,6 +2,9 @@ ...@@ -2,6 +2,9 @@
BUILDERDIR=$(realpath "$(dirname "${BASH_SOURCE[0]}")"/..) BUILDERDIR=$(realpath "$(dirname "${BASH_SOURCE[0]}")"/..)
: "${PROFILESDIR:=$BUILDERDIR/mkimage-profiles}"
: "${VMDIR:=/var/ftp/pvt/ISO/testing/template/iso}"
create_tmp() { create_tmp() {
mktemp -d -t ximper-builder.XXXXXXX mktemp -d -t ximper-builder.XXXXXXX
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment