Wdrożenie wystąpienia programu LibreWolf. Dodanie skrótu hashu commit do nazwy obrazu...

diff --git a/immudex-build b/immudex-build
index 7f7731cb4b20d60ddf202195eb7ffc25dfcb53e0..0e1149bfdbd7e28c4edb86d48dc8df7644ac4a90 100755 (executable)
--- a/immudex-build
+++ b/immudex-build
@@ -82,6 +82,7 @@ if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
 echo "-==Setting version for immudex image: $(date)==-" >> immudex_build.log;
 echo -n "Setting version for this immudex image...";
 git log --pretty=oneline | head -1 | awk '{printf $1}' | tee ${HOME}/build/immudex-testing/${arch}/staging/live/version >> immudex_build.log 2>&1;
+versionShort=$(cut -c 1-7 ${HOME}/build/immudex-testing/${arch}/staging/live/version);
 if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
 
 #Getting and copying bootloader files
@@ -139,5 +140,5 @@ if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi
 #Create iso image:
 cd $oldcwd;
 echo -n "Creating iso image...";
-xorriso as mkisofs -iso-level 3 -o "immudex-testing${arch}.iso" -full-iso9660-filenames -volid "immudex-testing${arch}" -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin -eltorito-boot isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table --eltorito-catalog isolinux/isolinux.cat -eltorito-alt-boot -e /boot/grub/efiboot.img -no-emul-boot -isohybrid-gpt-basdat -append_partition 2 0xef ${HOME}/build/immudex-testing/${arch}/staging/boot/grub/efiboot.img ${HOME}/build/immudex-testing/${arch}/staging >> immudex_build.log 2>&1;
+xorriso as mkisofs -iso-level 3 -o "immudex-testing${arch}_${versionShort}.iso" -full-iso9660-filenames -volid "immudex-testing${arch}_${versionShort}" -isohybrid-mbr /usr/lib/ISOLINUX/isohdpfx.bin -eltorito-boot isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table --eltorito-catalog isolinux/isolinux.cat -eltorito-alt-boot -e /boot/grub/efiboot.img -no-emul-boot -isohybrid-gpt-basdat -append_partition 2 0xef ${HOME}/build/immudex-testing/${arch}/staging/boot/grub/efiboot.img ${HOME}/build/immudex-testing/${arch}/staging >> immudex_build.log 2>&1;
 if [ $? -eq 0 ]; then echo -e "[ ${GREEN}OK${ENDCOLOR} ]"; fi

diff --git a/versions/base.sh b/versions/base.sh
index d637417ef4876685791948f69728782914bb55b5..c2cee54f09a64f5584b3eb6214cb83db478dcaed 100644 (file)
--- a/versions/base.sh
+++ b/versions/base.sh
@@ -107,6 +107,7 @@ cp -vv ~/immudex-testing/files/xfwm4.xml /etc/skel/.config/xfce4/xfconf/xfce-per
 
 cp -rvv ~/immudex-testing/files/sync.sh /usr/share;
 cp -vv ~/immudex-testing/files/gtk-main.css /usr/share/xfce4-notes-plugin/gtk-3.0/;
+cp -vv ~/immudex-testing/files/librewolf.desktop /usr/share/applications;
 cp -vv ~/immudex-testing/files/immudex_hostname.service /etc/systemd/system;
 
 tar -xzvf ~/immudex-testing/files/mozilla.tgz -C /etc/skel;