diff --git a/config/noobs/slides/A.png b/config/noobs/marketing/slides/A.png similarity index 100% rename from config/noobs/slides/A.png rename to config/noobs/marketing/slides/A.png diff --git a/config/noobs/slides/B.png b/config/noobs/marketing/slides/B.png similarity index 100% rename from config/noobs/slides/B.png rename to config/noobs/marketing/slides/B.png diff --git a/config/noobs/slides/C.png b/config/noobs/marketing/slides/C.png similarity index 100% rename from config/noobs/slides/C.png rename to config/noobs/marketing/slides/C.png diff --git a/config/noobs/slides/D.png b/config/noobs/marketing/slides/D.png similarity index 100% rename from config/noobs/slides/D.png rename to config/noobs/marketing/slides/D.png diff --git a/config/noobs/slides/E.png b/config/noobs/marketing/slides/E.png similarity index 100% rename from config/noobs/slides/E.png rename to config/noobs/marketing/slides/E.png diff --git a/config/noobs/slides_vga/A.png b/config/noobs/marketing/slides_vga/A.png similarity index 100% rename from config/noobs/slides_vga/A.png rename to config/noobs/marketing/slides_vga/A.png diff --git a/config/noobs/slides_vga/B.png b/config/noobs/marketing/slides_vga/B.png similarity index 100% rename from config/noobs/slides_vga/B.png rename to config/noobs/marketing/slides_vga/B.png diff --git a/config/noobs/slides_vga/C.png b/config/noobs/marketing/slides_vga/C.png similarity index 100% rename from config/noobs/slides_vga/C.png rename to config/noobs/marketing/slides_vga/C.png diff --git a/config/noobs/slides_vga/D.png b/config/noobs/marketing/slides_vga/D.png similarity index 100% rename from config/noobs/slides_vga/D.png rename to config/noobs/marketing/slides_vga/D.png diff --git a/config/noobs/slides_vga/E.png b/config/noobs/marketing/slides_vga/E.png similarity index 100% rename from config/noobs/slides_vga/E.png rename to config/noobs/marketing/slides_vga/E.png diff --git a/scripts/image b/scripts/image index ac5dbd27e3..11e3d13af6 100755 --- a/scripts/image +++ b/scripts/image @@ -419,15 +419,10 @@ fi cp -PR $ROOT/config/noobs/os.json $RELEASE_DIR/${DISTRONAME}_${PROJECT} cp -PR $ROOT/config/noobs/partition_setup.sh $RELEASE_DIR/${DISTRONAME}_${PROJECT} cp -PR $ROOT/config/noobs/partitions.json $RELEASE_DIR/${DISTRONAME}_${PROJECT} - if [ -d $DISTRO_DIR/$DISTRO/noobs/slides ]; then - cp -PR $DISTRO_DIR/$DISTRO/noobs/slides $RELEASE_DIR/${DISTRONAME}_${PROJECT} + if [ -d $DISTRO_DIR/$DISTRO/noobs/marketing ]; then + tar cf $RELEASE_DIR/${DISTRONAME}_${PROJECT}/marketing.tar -C $DISTRO_DIR/$DISTRO/noobs/marketing . else - cp -PR $ROOT/config/noobs/slides $RELEASE_DIR/${DISTRONAME}_${PROJECT} - fi - if [ -d $DISTRO_DIR/$DISTRO/noobs/slides_vga ]; then - cp -PR $DISTRO_DIR/$DISTRO/noobs/slides_vga $RELEASE_DIR/${DISTRONAME}_${PROJECT} - else - cp -PR $ROOT/config/noobs/slides_vga $RELEASE_DIR/${DISTRONAME}_${PROJECT} + tar cf $RELEASE_DIR/${DISTRONAME}_${PROJECT}/marketing.tar -C $ROOT/config/noobs/marketing . fi cp $ROOT/README* $RELEASE_DIR/${DISTRONAME}_${PROJECT} cp $ROOT/CHANGELOG $RELEASE_DIR/${DISTRONAME}_${PROJECT}/release_notes.txt