housekeeping

1 files changed, 14 insertions, 12 deletions

diff --git a/mk b/mk
index 66976fa8d..acea9b441 100755
--- a/mk
+++ b/mk
@@ -29,7 +29,7 @@ fi
 
 [ "$(cat ./LAST_BUILD_HOST)" == "$THIS_BUILD_HOST" ] || (echo "cleaning build/ dir" ; sudo rm -rf ./build)
 echo "$THIS_BUILD_HOST" > ./LAST_BUILD_HOST
-if [ ! -d ./build ]
+if   [ ! -d ./build ]
 then print "\n--- preparing build environment ---\n"
      mkdir ./build
 # else rm -f build/Makefile 2> /dev/null
@@ -42,15 +42,16 @@ fi
 
 
 print "\n--- running cmake ---\n"
+sed -i "s|_BUILD_DATE_|$(date +%Y.%m)|" src/branding/parabola/branding.desc
 cd ./build
-cmake -DCMAKE_BUILD_TYPE=Debug                                                          \
-      -DCMAKE_INSTALL_PREFIX=/usr                                                       \
-      -DCMAKE_INSTALL_LIBDIR=lib                                                        \
-      -DSKIP_MODULES="contextualprocess dracut dracutlukscfg dummycpp dummyprocess      \
-                      dummypython  dummypythonqt fsresizer initramfs initramfscfg       \
-                      interactiveterminal license openrcdmcryptcfg packages plymouthcfg \
-                      preservefiles rawfs removeuser shellprocess tracking webview" ..
-
+cmake -DCMAKE_BUILD_TYPE=Debug                                                     \
+      -DCMAKE_INSTALL_PREFIX=/usr                                                  \
+      -DCMAKE_INSTALL_LIBDIR=lib                                                   \
+      -DSKIP_MODULES="contextualprocess dracut dracutlukscfg dummycpp dummyprocess \
+                      dummypython  dummypythonqt fsresizer initramfs initramfscfg  \
+                      interactiveterminal license networkcfg openrcdmcryptcfg      \
+                      packages plymouthcfg preservefiles rawfs removeuser          \
+                      shellprocess tracking unpackfs webview"                      ..
 
 if [ -d /usr/share/calamares/ -o -f /usr/bin/calamares ]
 then print "\n--- running make uninstall ---\n"
@@ -69,19 +70,20 @@ fi
 if (($RUN_INSTALLED))
 then print "\n--- running make install ---\n"
      sudo make install || exit 1
+     sudo cp ../settings.conf /usr/share/calamares/
 else print "\n--- running make ---\n"
      make              || exit 1
+     cp ../settings.conf ./
 fi
 cd ..
 
 
 if (($RUN_INSTALLED)) && [ -f /usr/bin/calamares ]
 then print "\n--- launching calamares installed ---\n"
-     sudo calamares
+     sudo calamares -D 6
 elif [ -f build/calamares ]
 then print "\n--- launching calamares uninstalled ---\n"
-     cp ./settings.conf ./build
      cd ./build
-     sudo ./calamares -d
+     sudo ./calamares -d 6
      cd ..
 fi