Merge pull request #369 from MilhouseVH/noobs_quotes

noobs: single quotes break json
This commit is contained in:
Lukas Rusak 2016-05-20 13:13:09 -07:00
commit c5fdc48a4c
4 changed files with 7 additions and 3 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 840 B

View File

@ -63,7 +63,7 @@
NOOBS_HEX="2,3,4,5,6,7,8,9,d,e,f,10,11,12,14,19,0092,0093"
# NOOBS supported model versions
NOOBS_SUPPORTED_MODELS="'Pi Model','Pi Compute Module','Pi Zero'"
NOOBS_SUPPORTED_MODELS='"Pi Model","Pi Compute Module","Pi Zero"'
################################################################################
# setup build defaults

View File

@ -63,7 +63,7 @@
NOOBS_HEX="1040,1041,2082"
# NOOBS supported model versions
NOOBS_SUPPORTED_MODELS="'Pi 2','Pi 3'"
NOOBS_SUPPORTED_MODELS='"Pi 2","Pi 3"'
################################################################################
# setup build defaults

View File

@ -449,7 +449,11 @@ fi
# create release dir
mkdir -p $RELEASE_DIR/${DISTRONAME}_${PROJECT}
cp -PR $DISTRO_DIR/$DISTRO/${DISTRONAME}.png $RELEASE_DIR/${DISTRONAME}_${PROJECT}/${DISTRONAME}_${PROJECT}.png
if [ -f $DISTRO_DIR/$DISTRO/${DISTRONAME}_40x40.png ]; then
cp -PR $DISTRO_DIR/$DISTRO/${DISTRONAME}_40x40.png $RELEASE_DIR/${DISTRONAME}_${PROJECT}/${DISTRONAME}_${PROJECT}.png
else
cp -PR $DISTRO_DIR/$DISTRO/${DISTRONAME}.png $RELEASE_DIR/${DISTRONAME}_${PROJECT}/${DISTRONAME}_${PROJECT}.png
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}