Merge branch 'master' into 'master'

.gitlab-ci.yml

@@ -13,15 +13,13 @@ build-hamara-sugam-amd64:
     script:
     - apt-get update
     - apt-get -y upgrade
-    - apt-get -y install figlet apt-utils build-essential devscripts binutils debootstrap git syslinux squashfs-tools genisoimage dh-make live-build live-config
-    
-    #Actually build the ISO
-    - ./mkbuild iso amd64 in.devel.hamaralinux.org hamara-sugam final
-    
-    # The files which are to be made available in Gitlab interface
+    - apt-get -y install figlet apt-utils build-essential devscripts tree binutils debootstrap git syslinux squashfs-tools genisoimage live-build live-config
+    - ./mkbuild iso amd64 in.devel.hamaralinux.org hamara-sugam final #build amd64
+    - tree builds/$CI_PROJECT_NAMESPACE/hamara-live-build/output
 
     artifacts:
         paths:
+            - builds/$CI_PROJECT_NAMESPACE/hamara-live-build/output/
             - ../hamara-live-build/output/*
         untracked: false
         expire_in: 1 day
@@ -37,13 +35,13 @@ build-hamara-sugam-i386:
     script:
         - apt-get update
         - apt-get -y upgrade
-        - apt-get -y install figlet apt-utils build-essential devscripts binutils debootstrap git syslinux squashfs-tools genisoimage dh-make live-build live-config
-            #Actually build the ISO
-        - ./mkbuild iso i386 in.devel.hamaralinux.org hamara-sugam final
+        - apt-get -y install figlet apt-utils build-essential devscripts tree binutils debootstrap git syslinux squashfs-tools genisoimage live-build live-config
+        - ./mkbuild iso i386 in.devel.hamaralinux.org hamara-sugam final #build i386
+        - tree builds/$CI_PROJECT_NAMESPACE/hamara-live-build/output
 
-        # The files which are to be made available in Gitlab interface
     artifacts:
         paths:
-            - output/*
+            - builds/$CI_PROJECT_NAMESPACE/hamara-live-build/output/
+            - ../hamara-live-build/output/*
         untracked: false
-        expire_in: 1 day
+        expire_in: 1 day
\ No newline at end of file

config.d/hamara-sugam/config/hooks/live/0080-remove-shortcut-files.chroot

@@ -10,8 +10,8 @@ rm -f /usr/share/applications/gksu.desktop
 #Remove calamares desktop file
 rm -f /usr/share/applications/calamares.desktop
 
-#Remove gtkhash desktop file
-rm -f /usr/share/applications/gtkhash.desktop
-
 #Remove bluetooth adapters desktop file
 rm -f /usr/share/applications/bluetooth-adapters.desktop
+
+#Remove gtkhash desktop file
+rm -f /usr/share/applications/gtkhash.desktop

config.d/hamara-sugam/config/package-lists/desktop.list.chroot

@@ -20,4 +20,8 @@ gimp
 
 #Installer
 calamares
-calamares-settings-hamara
\ No newline at end of file
+calamares-settings-hamara
+
+#Hamara welcome app
+hamara-welcome
+hamara-sugam-config
\ No newline at end of file

config.d/hamara-sugam/config/package-lists/live-packages.list.chroot_live

@@ -4,3 +4,4 @@ virtualbox-guest-utils
 #virtualbox-guest-x11
 
 hamara-live
+hamara-wallpapers
\ No newline at end of file

data/hamara-sugam/bootloaders/grub-pc/grub.cfg

@@ -37,23 +37,13 @@ fi
 
 # Live boot
 
-menuentry "Try Hamara Sugam without Installing" {
+menuentry "Boot Hamara Sugam Live" {
  set gfxpayload=keep
  linux KERNEL_LIVE APPEND_LIVE
  initrd INITRD_LIVE
  }
- 
-menuentry "Try Hamara Sugam (SafeMode) without Installing" {
+
+menuentry "Boot Hamara Sugam Live (safe mode)" {
  linux KERNEL_LIVE boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal
  initrd INITRD_LIVE
 }
- 
-#menuentry "Install Hamara Sugam" {
-# linux KERNEL_GI APPEND_GI 
-# initrd INITRD_GI
-# }
-
-#menuentry "Install with speech synthesis" --hotkey i {
-# linux KERNEL_DI vga=788 speakup.synth=soft --- quiet
-# initrd INITRD_GI
-#}

data/hamara-sugam/bootloaders/isolinux/live.cfg.in

 label live-@FLAVOUR@
-	menu label Try Hamara Sugam before installing
+	menu label Boot Hamara Sugam Live
 	menu default
 	linux @LINUX@
 	initrd @INITRD@
 	append @APPEND_LIVE@
 
 label live-@FLAVOUR@-failsafe
-	menu label Try Hamara Sugam (safe mode) before installing
+	menu label Boot Hamara Sugam Live (safe mode)
 	linux @LINUX@
 	initrd @INITRD@
 	append @APPEND_LIVE_FAILSAFE@