QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use more generic variable for not keeping prepared image

Browse Source 
Use this:
DISCARD_PREPARED_IMAGE=1
This commit is contained in:
Marek Marczykowski-Górecki 2017-09-26 02:48:35 +02:00
parent bca3759c78
commit fe05ad6935
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -16,7 +16,7 @@ endif
TEMPLATE_ENV_WHITELIST += \ TEMPLATE_ENV_WHITELIST += \
DIST DISTRIBUTION TEMPLATE_SCRIPTS TEMPLATE_NAME TEMPLATE_FLAVOR \ DIST DISTRIBUTION TEMPLATE_SCRIPTS TEMPLATE_NAME TEMPLATE_FLAVOR \
TEMPLATE_FLAVOR_DIR TEMPLATE_OPTIONS APPMENUS_DIR \ TEMPLATE_FLAVOR_DIR TEMPLATE_OPTIONS APPMENUS_DIR \
VERBOSE DEBUG PATH BUILDER_DIR SRC_DIR \ VERBOSE DEBUG PATH BUILDER_DIR SRC_DIR DISCARD_PREPARED_IMAGE \
TEMPLATE_ROOT_WITH_PARTITIONS USE_QUBES_REPO_VERSION \ TEMPLATE_ROOT_WITH_PARTITIONS USE_QUBES_REPO_VERSION \
USE_QUBES_REPO_TESTING BUILDER_TURBO_MODE REPO_PROXY USE_QUBES_REPO_TESTING BUILDER_TURBO_MODE REPO_PROXY

4
qubeize_image
View File

@ -61,8 +61,8 @@ trap cleanup ERR
export IMG="qubeized_images/$NAME/root.img" export IMG="qubeized_images/$NAME/root.img"
mkdir -p "qubeized_images/$NAME" mkdir -p "qubeized_images/$NAME"
if [ "$TRAVIS" = "true" ]; then if [ "0$DISCARD_PREPARED_IMAGE" -eq "1" ]; then
echo "--> Moving $CLEANIMG to $IMG (save space on Travis-CI)..." echo "--> Moving $CLEANIMG to $IMG..."
mv "$CLEANIMG" "$IMG" || exit 1 mv "$CLEANIMG" "$IMG" || exit 1
else else
echo "--> Copying $CLEANIMG to $IMG..." echo "--> Copying $CLEANIMG to $IMG..."