Clean up init setters.

When attempting to expand on legacy style image name, it outputs Done on the next line. Remove this Done line for pretty factor. Cleanup the fixed_size_partitions file on upload so if it's blank it gets 1 instead of :1
FOGProject · Jan 5, 2017 · 7289b88 · 7289b88
1 parent daf3d28
commit 7289b88
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/packages/web/lib/fog/system.class.php b/packages/web/lib/fog/system.class.php
@@ -53,7 +53,7 @@ private static function _versionCompare()
     public function __construct()
     {
         self::_versionCompare();
-        define('FOG_VERSION', '7');
+        define('FOG_VERSION', '8');
         define('FOG_SCHEMA', 245);
         define('FOG_BCACHE_VER', 111);
         define('FOG_SVN_REVISION', 6052);

diff --git a/packages/web/management/languages/messages.pot b/packages/web/management/languages/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2017-01-04 16:19-0500\n"
+"POT-Creation-Date: 2017-01-04 19:53-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"

diff --git a/src/buildroot/package/fog/scripts/bin/fog.download b/src/buildroot/package/fog/scripts/bin/fog.download
@@ -95,7 +95,6 @@ preparePartitions() {
                         case $do_fill in
                             1)
                                 fillDiskWithPartitions "$hd" "$imagePath" 1
-                                echo "Done"
                                 ;;
                             *)
                                 startsector="2048s"

diff --git a/src/buildroot/package/fog/scripts/bin/fog.upload b/src/buildroot/package/fog/scripts/bin/fog.upload
@@ -70,7 +70,9 @@ beginUpload() {
             case $osid in
                 [4-7]|9|50|51)
                     echo " * Setting up any additional fixed parts"
-                    [[ $((ntfscnt + extfscnt)) -gt 0  && $part_number -gt 1 ]] && fixed_size_partitions="$fixed_size_partitions:1"
+                    if [[ $((ntfscnt + extfscnt)) -gt 0  && $part_number -gt 1 ]]; then
+                        [[ -n $fixed_size_partitions ]] && fixed_size_partitions="$fixed_size_partitions:1" || fixed_size_partitions="1"
+                    fi
                     part_number=0
                     for part in $parts; do
                         getPartitionNumber "$part"