From 1c1c79983b2cfdde539c5ccc15c3b6fa0c7b3fe5 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 30 Nov 2014 15:25:44 +0000 Subject: [PATCH] [molecules] rename +dev to -dev, avoid potential idiotic fs issues --- ...nimal+dev.spec => sabayon-amd64-minimal-dev.spec} | 4 ++-- ...base+dev.spec => sabayon-amd64-spinbase-dev.spec} | 2 +- scripts/iso_build.sh | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) rename molecules/{sabayon-amd64-minimal+dev.spec => sabayon-amd64-minimal-dev.spec} (84%) rename molecules/{sabayon-amd64-spinbase+dev.spec => sabayon-amd64-spinbase-dev.spec} (96%) diff --git a/molecules/sabayon-amd64-minimal+dev.spec b/molecules/sabayon-amd64-minimal-dev.spec similarity index 84% rename from molecules/sabayon-amd64-minimal+dev.spec rename to molecules/sabayon-amd64-minimal-dev.spec index 7e39f2e..c3257ac 100644 --- a/molecules/sabayon-amd64-minimal+dev.spec +++ b/molecules/sabayon-amd64-minimal-dev.spec @@ -5,5 +5,5 @@ %env release_version: ${SABAYON_RELEASE:-LATEST} release_desc: amd64 Minimal Development -%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-DAILY}_amd64_SpinBase+dev.iso -%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_Minimal+dev.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_${ISO_TAG:-DAILY}_amd64_SpinBase-dev.iso +%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_Minimal-dev.iso diff --git a/molecules/sabayon-amd64-spinbase+dev.spec b/molecules/sabayon-amd64-spinbase-dev.spec similarity index 96% rename from molecules/sabayon-amd64-spinbase+dev.spec rename to molecules/sabayon-amd64-spinbase-dev.spec index af88424..411fe33 100644 --- a/molecules/sabayon-amd64-spinbase+dev.spec +++ b/molecules/sabayon-amd64-spinbase-dev.spec @@ -18,4 +18,4 @@ release_desc: amd64 SpinBase # Destination ISO image name, call whatever you want.iso, not mandatory # Keep this here and set, otherwise daily builds automagic won't work -%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_SpinBase+dev.iso +%env destination_iso_image_name: Sabayon_Linux_${SABAYON_RELEASE:-LATEST}_amd64_SpinBase-dev.iso diff --git a/scripts/iso_build.sh b/scripts/iso_build.sh index 52b6b9d..6f52dc1 100755 --- a/scripts/iso_build.sh +++ b/scripts/iso_build.sh @@ -71,11 +71,11 @@ if [ "${ACTION}" = "weekly" ] || [ "${ACTION}" = "daily" ]; then # Daily molecules SOURCE_SPECS+=( "sabayon-amd64-spinbase.spec" - "sabayon-amd64-spinbase+dev.spec" + "sabayon-amd64-spinbase-dev.spec" ) SOURCE_SPECS_ISO+=( "${DISTRO_NAME}_${ISO_TAG}_amd64_SpinBase.iso" - "${DISTRO_NAME}_${ISO_TAG}_amd64_SpinBase+dev.iso" + "${DISTRO_NAME}_${ISO_TAG}_amd64_SpinBase-dev.iso" ) REMASTER_SPECS+=( "sabayon-amd64-gnome.spec" @@ -114,11 +114,11 @@ elif [ "${ACTION}" = "dailybase" ]; then SOURCE_SPECS+=( "sabayon-amd64-spinbase.spec" - "sabayon-amd64-spinbase+dev.spec" + "sabayon-amd64-spinbase-dev.spec" ) SOURCE_SPECS_ISO+=( "${DISTRO_NAME}_${ISO_TAG}_amd64_SpinBase.iso" - "${DISTRO_NAME}_${ISO_TAG}_amd64_SpinBase+dev.iso" + "${DISTRO_NAME}_${ISO_TAG}_amd64_SpinBase-dev.iso" ) elif [ "${ACTION}" = "monthly" ] || [ "${ACTION}" = "release" ]; then @@ -147,11 +147,11 @@ elif [ "${ACTION}" = "monthly" ] || [ "${ACTION}" = "release" ]; then SOURCE_SPECS+=( "sabayon-amd64-spinbase.spec" - "sabayon-amd64-spinbase+dev.spec" + "sabayon-amd64-spinbase-dev.spec" ) SOURCE_SPECS_ISO+=( "${DISTRO_NAME}_${ISO_TAG}_amd64_SpinBase.iso" - "${DISTRO_NAME}_${ISO_TAG}_amd64_SpinBase+dev.iso" + "${DISTRO_NAME}_${ISO_TAG}_amd64_SpinBase-dev.iso" ) REMASTER_SPECS+=( "sabayon-amd64-gnome.spec"