housekeeping

7 files changed, 43 insertions, 40 deletions

diff --git a/configs/profile/airootfs/etc/skel/Desktop/parabola-installer.desktop b/configs/profile/airootfs/etc/skel/Desktop/parabola-installer.desktop
index a5d96b6..a46c6f1 100644
--- a/configs/profile/airootfs/etc/skel/Desktop/parabola-installer.desktop
+++ b/configs/profile/airootfs/etc/skel/Desktop/parabola-installer.desktop
@@ -9,7 +9,7 @@ Name[pt_BR]=Instalador do Parabola
 GenericName=System Installer
 Keywords=calamares;system;installer
 TryExec=calamares
-Exec=sudo /usr/bin/calamares
+Exec=sudo /usr/bin/calamares -D 6
 Comment=Distribution-independent installer framework - Parabola edition
 Icon=calamares
 Terminal=false
diff --git a/configs/profile/airootfs/root/customize_airootfs.sh b/configs/profile/airootfs/root/customize_airootfs.sh
index 2f7db97..edbd2d6 100755
--- a/configs/profile/airootfs/root/customize_airootfs.sh
+++ b/configs/profile/airootfs/root/customize_airootfs.sh
@@ -21,7 +21,7 @@ chmod 440 /etc/sudoers.d/g_wheel
 
 LOG_CONFIG "pacman"
 
-sed -i "s|#Server|Server|" /etc/pacman.d/mirrorlist
+echo 'Server = https://repo.parabola.nu/$repo/os/$arch' >> /etc/pacman.d/mirrorlist
 [[ "${ISO_INIT}"     == 'openrc'   ]] && sed -i $NONSYSTEMD_REGEX /etc/pacman-online.conf
 [[ "${INSTALL_TYPE}" == 'Complete' ]] && cp /etc/pacman-offline.conf /etc/pacman.conf || \
                                          cp /etc/pacman-online.conf  /etc/pacman.conf
diff --git a/configs/profile/build.sh b/configs/profile/build.sh
index 33fce97..f9b15c8 100755
--- a/configs/profile/build.sh
+++ b/configs/profile/build.sh
@@ -19,8 +19,8 @@ iso_dirname='parabola'
 enable_offline_install='false'
 enable_tts_brltty='false'
 offline_switch=''
-work_dir=./work/
-out_dir=./out/
+work_dir=./work
+out_dir=./out
 target=''
 verbose=''
 efi_img_kbytes=40000
@@ -268,9 +268,9 @@ make_syslinux() {
 make_isolinux() {
     mkdir -p ${work_dir}/iso/isolinux
     sed "s|%INSTALL_DIR%|${iso_dirname}|g" ${releng_dir}/isolinux/isolinux.cfg > ${work_dir}/iso/isolinux/isolinux.cfg
-    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/isolinux.bin ${work_dir}/iso/isolinux/
-    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/isohdpfx.bin ${work_dir}/iso/isolinux/
-    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/ldlinux.c32 ${work_dir}/iso/isolinux/
+    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/isolinux.bin         ${work_dir}/iso/isolinux/
+    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/isohdpfx.bin         ${work_dir}/iso/isolinux/
+    cp ${work_dir}/${arch}/root-image/usr/lib/syslinux/bios/ldlinux.c32          ${work_dir}/iso/isolinux/
 }
 
 # Prepare /EFI
@@ -281,7 +281,7 @@ make_efi() {
     fi
 
     mkdir -p ${work_dir}/iso/loader/entries
-    cp ${releng_dir}/efiboot/loader/loader.conf ${work_dir}/iso/loader/
+    cp ${releng_dir}/efiboot/loader/loader.conf                       ${work_dir}/iso/loader/
     cp ${releng_dir}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/iso/loader/entries/
     cp ${releng_dir}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/iso/loader/entries/
 
@@ -311,7 +311,7 @@ make_efiboot() {
     mount ${work_dir}/iso/EFI/parabolaiso/efiboot.img ${work_dir}/efiboot
 
     mkdir -p ${work_dir}/efiboot-staging/EFI/parabolaiso
-    cp ${work_dir}/iso/${iso_dirname}/boot/x86_64/vmlinuz ${work_dir}/efiboot-staging/EFI/parabolaiso/vmlinuz.efi
+    cp ${work_dir}/iso/${iso_dirname}/boot/x86_64/vmlinuz         ${work_dir}/efiboot-staging/EFI/parabolaiso/vmlinuz.efi
     cp ${work_dir}/iso/${iso_dirname}/boot/x86_64/parabolaiso.img ${work_dir}/efiboot-staging/EFI/parabolaiso/parabolaiso.img
 
     mkdir -p ${work_dir}/efiboot-staging/EFI/boot
@@ -320,10 +320,9 @@ make_efiboot() {
     fi
 
     mkdir -p ${work_dir}/efiboot-staging/loader/entries
-    cp ${releng_dir}/efiboot/loader/loader.conf ${work_dir}/efiboot-staging/loader/
-    cp ${releng_dir}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf ${work_dir}/efiboot-staging/loader/entries/
-    cp ${releng_dir}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf ${work_dir}/efiboot-staging/loader/entries/
-
+    cp ${releng_dir}/efiboot/loader/loader.conf                           ${work_dir}/efiboot-staging/loader/
+    cp ${releng_dir}/efiboot/loader/entries/uefi-shell-v2-x86_64.conf     ${work_dir}/efiboot-staging/loader/entries/
+    cp ${releng_dir}/efiboot/loader/entries/uefi-shell-v1-x86_64.conf     ${work_dir}/efiboot-staging/loader/entries/
     sed "s|%PARABOLAISO_LABEL%|${iso_label}|g;
          s|%INSTALL_DIR%|${iso_dirname}|g" \
         ${releng_dir}/efiboot/loader/entries/parabolaiso-x86_64-cd.conf > ${work_dir}/efiboot-staging/loader/entries/parabolaiso-x86_64.conf
@@ -352,9 +351,9 @@ make_aitab() {
 
 # Build all filesystem images specified in aitab (.fs.sfs .sfs)
 make_prepare() {
-    cp -a -l -f ${work_dir}/${arch}/root-image ${work_dir}
-    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} -C ${pacman_conf} pkglist
-    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} -C ${pacman_conf} ${offline_switch} prepare
+    cp -a -l -f ${work_dir}/${arch}/root-image ${work_dir}/
+    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/ -D ${iso_dirname} -C ${pacman_conf} pkglist
+    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/ -D ${iso_dirname} -C ${pacman_conf} ${offline_switch} prepare
 
     rm -rf ${work_dir}/root-image
     # rm -rf ${work_dir}/${arch}/root-image (if low space, this helps)
@@ -362,8 +361,8 @@ make_prepare() {
 
 # Build ISO
 make_iso() {
-    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} checksum
-    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir} -D ${iso_dirname} -L ${iso_label} -o ${out_dir} iso ${iso_filename}
+    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/ -D ${iso_dirname} checksum
+    setarch ${arch} mkparabolaiso ${verbose} -w ${work_dir}/ -D ${iso_dirname} -L ${iso_label} -o ${out_dir}/ iso ${iso_filename}
 }
 
 
@@ -411,10 +410,11 @@ else
 fi
 iso_title="${iso_title} - ${iso_edition} Edition ${iso_version}"
 iso_filename="parabola-${iso_edition}-${iso_arch}-${iso_type}-${iso_version}.iso"
-iso_filename=$(     echo ${iso_filename}                   | tr '[:upper:]/' '[:lower:]-')
-out_dir=${out_dir}$(echo ${iso_edition}-${iso_version}     | tr '[:upper:]/' '[:lower:]-')
-iso_init=$(         echo ${iso_edition}  | cut -d '/' -f 1 | tr '[:upper:]'  '[:lower:]' )
-iso_gui=$(          echo ${iso_edition}  | cut -d '/' -f 2 | tr '[:upper:]'  '[:lower:]' )
+release_dirname="${iso_edition}-${iso_arch}-${iso_version}"
+iso_filename=$(      echo ${iso_filename}                  | tr '[:upper:]/' '[:lower:]-')
+out_dir=${out_dir}/$(echo ${release_dirname}               | tr '[:upper:]/' '[:lower:]-')
+iso_init=$(          echo ${iso_edition} | cut -d '/' -f 1 | tr '[:upper:]'  '[:lower:]' )
+iso_gui=$(           echo ${iso_edition} | cut -d '/' -f 2 | tr '[:upper:]'  '[:lower:]' )
 [[ "${iso_init}" == 'openrc' ]] && base_group='base-openrc' || base_group='base'
 [[ "${archs}"    == 'i686'   ]] && arch='i686'              || arch='x86_64'
 
diff --git a/configs/profile/packages/packages-all.all b/configs/profile/packages/packages-all.all
index 1333342..2012380 100644
--- a/configs/profile/packages/packages-all.all
+++ b/configs/profile/packages/packages-all.all
@@ -20,7 +20,6 @@ ethtool
 exfat-utils
 f2fs-tools
 fsarchiver
-gnu-netcat
 gptfdisk
 grub
 irssi
diff --git a/configs/profile/packages/packages-gui.all b/configs/profile/packages/packages-gui.all
index a4f3d6c..ff7c0e2 100644
--- a/configs/profile/packages/packages-gui.all
+++ b/configs/profile/packages/packages-gui.all
@@ -37,11 +37,11 @@ gnumeric
 gparted
 icedove
 iceweasel
+jami
 leafpad
 octopi
 pidgin
 qtox
-ring
 smplayer
 
 
diff --git a/configs/profile/rebuild.sh b/configs/profile/rebuild.sh
index 02f9999..29c47e1 100755
--- a/configs/profile/rebuild.sh
+++ b/configs/profile/rebuild.sh
@@ -1,21 +1,24 @@
 #!/bin/bash
 
-readonly MODE='wipe'                # total wipe of work dir optionally preserving package cache
-readonly PRESERVE_CACHE='false'     # preserve package cache in 'wipe' mode
-# readonly MODE='rebuild'           # full update rebuild preserving work dir
-# readonly MODE='tweak'             # apply chroot customization tweaks only
-# readonly TARGET='dual'              # dual-arch                   (default)
-# readonly TARGET='i686'            # i686 target only
-readonly TARGET='x86_64'          # x86_64 target only
-readonly EDITION='OpenRC/CLI'     # OpenRC/CLI init/WM-DE pair
-# readonly EDITION='OpenRC/LXDE'    # OpenRC/LXDE init/WM-DE pair
-# readonly EDITION='SystemD/CLI'      # SystemD/CLI init/WM-DE pair (default)
-# readonly EDITION='SystemD/LXDE'   # SystemD/LXDE init/WM-DE pair
-readonly TALKING=''                 # speech and braille disabled (default)
-# readonly TALKING='-S'             # speech and braille enabled
-readonly CACHE=''                   # net-install                 (default)
-# readonly CACHE='-O'               # offline install
-readonly VERSION="`date +%Y.%m.%d`" # for ISO filename            (default)
+## rebuild.sh options ##
+readonly PRESERVE_CACHE='false'    # preserve package cache in 'wipe' mode
+readonly MODE='wipe'               # total wipe of work dir, optionally preserving package cache
+# readonly MODE='rebuild'          # full update rebuild preserving work dir
+# readonly MODE='tweak'            # apply chroot customization tweaks only
+
+## build.sh options ##
+readonly TARGET='dual'             # dual-arch                   (default)
+# readonly TARGET='i686'           # i686 target only
+# readonly TARGET='x86_64'         # x86_64 target only
+# readonly EDITION='OpenRC/CLI'    # OpenRC/CLI init/WM-DE pair
+# readonly EDITION='OpenRC/LXDE'   # OpenRC/LXDE init/WM-DE pair
+readonly EDITION='SystemD/CLI'     # SystemD/CLI init/WM-DE pair (default)
+# readonly EDITION='SystemD/LXDE'  # SystemD/LXDE init/WM-DE pair
+readonly TALKING=''                # speech and braille disabled (default)
+# readonly TALKING='-S'            # speech and braille enabled
+readonly CACHE=''                  # net-install                 (default)
+# readonly CACHE='-O'              # offline install
+readonly VERSION="$(date +%Y.%m)"  # for ISO filename            (default)
 # readonly VERSION="`date +%Y.%m.%d-%H.%M`-alpha"
 readonly OUT_DIR=./out/new/
 
diff --git a/parabolaiso/mkparabolaiso b/parabolaiso/mkparabolaiso
index 9bd527e..3db5da5 100755
--- a/parabolaiso/mkparabolaiso
+++ b/parabolaiso/mkparabolaiso
@@ -428,6 +428,7 @@ command_iso () {
     # copy package lists and create checksums and optional torrent files
     pkglist="${work_dir}/iso/${install_dir}/pkglist.${arch}.txt"
     mkmetadata "${out_dir}" "${img_name}" "${pkglist}" || true
+    chmod 444 ${out_dir}/*
 }
 
 # create airootfs.sfs filesystem, and push it in "iso" directory.