Adapt scripts to build new package for exclusive Trinity icons, water…

…leaf-icon-theme-tde

q4os/build_debs.sh

@@ -18,19 +18,27 @@ DEBFS_OUT="$(readlink -m "$WATERLEAF_DIR/../.build2_fsdeb/")"
 # echo "DEBFS_OUT:       $DEBFS_OUT/"
 # read -p "Before build debfs, press Enter to continue ..." RDVAR1
 
-if [ ! -d "$DEBFS_OUT/out_iconset-base/" ] ; then
+if [ ! -d "$DEBFS_OUT/out_iconset1-base/" ] ; then
   if [ ! -d "$ICONSET_IN/" ] ; then
     sh "$WATERLEAF_DIR/99_generate_iconset.sh"
   else
     read -p "[I:] Skipped 99_generate_iconset.sh, Enter to continue ..." RDVAR1
   fi
-  sh "$WATERLEAF_DIR/q4os/build_fs.sh" "$ICONSET_IN/" "$DEBFS_OUT/"
+  rm -rf "$DEBFS_OUT/" ; mkdir -p "$DEBFS_OUT/"
+  INITF_SYMLINKS="1" MAPS_PATH="$THIS_SCRIPT_DIR/maps/bb*.map1" sh "$WATERLEAF_DIR/q4os/build_fs.sh" "$ICONSET_IN/" "/tmp/.aaaicg1/"
+  mv "/tmp/.aaaicg1/outset1" "$DEBFS_OUT/out_iconset1-base"
+  INITF_SYMLINKS="0" MAPS_PATH="$THIS_SCRIPT_DIR/maps/cc*.map1" sh "$WATERLEAF_DIR/q4os/build_fs.sh" "/tmp/.aaaicg1/outset2/" "/tmp/.aaaicg2/"
+  mv "/tmp/.aaaicg2/outset1" "$DEBFS_OUT/out_iconset2-tde"
+  mv "/tmp/.aaaicg2/outset2" "$DEBFS_OUT/out_iconset3-extra"
 else
   read -p "[I:] Skipped build_fs.sh, Enter to continue ..." RDVAR1
 fi
+
+read -p "Before packages creating, Enter to continue ..." RDVAR1
 cd "$WATERLEAF_DIR/q4os/"
 sh /opt/program_files/q4os-devpack/bin/create_q4app_setup.sh installer1.cfg
 sh /opt/program_files/q4os-devpack/bin/create_q4app_setup.sh installer2.cfg
+sh /opt/program_files/q4os-devpack/bin/create_q4app_setup.sh installer3.cfg
 
 echo
 echo "Completed."

q4os/build_fs.sh

@@ -9,21 +9,20 @@
 cd "$(dirname $0)"
 THIS_SCRIPT_DIR="$(pwd)"
 
-MAPS_DIR="$THIS_SCRIPT_DIR/maps/" #*.map1 mapping files directory
 WKDIR1="$(mktemp -d -t ".00_spliticonset_XXXXXXXXXX")/"
 
 ARCHIVE1="$1" #input icon set
 OUTDIR1="$2" #output dir
 
 ICONSET_IN="$WKDIR1/in_iconset/"
-ICONSET_OUT1="$WKDIR1/out_iconset-base/"
-ICONSET_OUT2="$WKDIR1/out_iconset-extra/"
+ICONSET_OUT1="$WKDIR1/outset1/"
+ICONSET_OUT2="$WKDIR1/outset2/"
 
 SYMLINKS_FIX_SCRIPT="$THIS_SCRIPT_DIR/../95_fix_symlinks.sh"
 
 WKFL01="$WKDIR1/.iconset_in_names.lst" #all icons names list
 ICIN_LIST_FL="$WKDIR1/.iconset_in_files.lst" #all icon files full path list
-BROKEN_LINKS_LIST="$WKDIR1/.brokenlinks.map1" #unsatisfied symlinks on phase-1
+BROKEN_LINKS_LIST="$WKDIR1/.brokenlinks.map" #unsatisfied symlinks on phase-1
 
 #----------------------------------------------------------------------------------------------
 # functions
@@ -51,7 +50,7 @@ local WKFL02="$WKDIR1/.bbb.lst"
 if [ -f "$BROKEN_LINKS_LIST" ] ; then
   local BBLST="$BROKEN_LINKS_LIST"
 fi
-cat $MAPS_DIR/*.map1 $BBLST | sort -u > $WKFL02
+cat $MAPS_PATH $BBLST | sort -u > $WKFL02
 comm -12 $WKFL02 $WKFL01 > $WKDIR1/out1_std.lst
 comm -13 $WKFL02 $WKFL01 > $WKDIR1/out2_extra.lst
 rm "$WKFL02"
@@ -97,14 +96,18 @@ rm -rf $WKDIR1/tmp/
 
 #extract the iconset
 # read -p "press Enter to continue ..." XXX
-if [ ! -f "$ARCHIVE1/index.theme" ] ; then
+if [ ! -f "$ARCHIVE1/index.theme" ] && [ ! -d "$ARCHIVE1/32x32/" ] ; then
   echo "[E:] Iconset source file not found, exiting ..."
   exit 10
 fi
 if [ -z "$OUTDIR1" ] || [ "$OUTDIR1" = "/" ] ; then
   echo "[E:] Incorrect output directory, exiting ..."
   exit 11
 fi
+if [ -z "$MAPS_PATH" ] || [ -z "$( ls $MAPS_PATH )" ] ; then
+  echo "[E:] Map files $MAPS_PATH don't exist, exiting ..."
+  exit 12
+fi
 echo
 echo "Building icon theme directories ..."
 echo "Cleaning ..."
@@ -115,9 +118,11 @@ echo "Copying ..."
 cp -r $ARCHIVE1/* $ICONSET_IN/
 
 
-#caution: the input icon set must have multiple level symlinks fixed and no broken symlinks,
-#so fix the input icon set first
-FIX_DOUBLE_LINKS="1" sh "$SYMLINKS_FIX_SCRIPT" "$ICONSET_IN/"
+if [ "$INITF_SYMLINKS" != "0" ] ; then
+  #caution: the input icon set must have multiple level symlinks fixed and no broken symlinks,
+  #so fix the input icon set first
+  FIX_DOUBLE_LINKS="1" sh "$SYMLINKS_FIX_SCRIPT" "$ICONSET_IN/"
+fi
 
 #make icons lists from the input icon set
 # read -p "press Enter to continue ..." XXX

q4os/installer1.cfg

@@ -4,15 +4,15 @@ TEMPLATES_DIR_0="$TEMPLATESDIR0"
 TEMPLATES_DIR="."
 
 OUT_DIR="../../.build3_packages/"
-CHKINSTALL_COMMAND="cp -r ../../.build2_fsdeb/out_iconset-base/* /usr/share/icons/Waterleaf/"
+CHKINSTALL_COMMAND="cp -r ../../.build2_fsdeb/out_iconset1-base/* /usr/share/icons/Waterleaf/"
 INSTALL_PREFIX="/"
 
 PK_NAME="waterleaf-icon-theme"
 # APPNAME_DESC=""
 PK_MAINTAINER="[email protected]"
 # Q4VER_MIN="4.0"
 # Q4VER_MAX="4.9999"
-PK_VERS="20220921-4.2"
+PK_VERS="20221125-4.3"
 PK_RELEASE="a1"
 PK_DEPENDS="libc6, hicolor-icon-theme"
 # PK_RECOMMENDS=""

q4os/installer2.cfg

@@ -4,15 +4,15 @@ TEMPLATES_DIR_0="$TEMPLATESDIR0"
 TEMPLATES_DIR="."
 
 OUT_DIR="../../.build3_packages/"
-CHKINSTALL_COMMAND="cp -r ../../.build2_fsdeb/out_iconset-extra/* /usr/share/icons/Waterleaf/"
+CHKINSTALL_COMMAND="cp -r ../../.build2_fsdeb/out_iconset2-tde/* /usr/share/icons/Waterleaf/"
 INSTALL_PREFIX="/"
 
-PK_NAME="waterleaf-icon-theme-extra"
+PK_NAME="waterleaf-icon-theme-tde"
 # APPNAME_DESC=""
 PK_MAINTAINER="[email protected]"
 # Q4VER_MIN="4.0"
 # Q4VER_MAX="4.9999"
-PK_VERS="20220921-4.2"
+PK_VERS="20221125-4.3"
 PK_RELEASE="a1"
 PK_DEPENDS="libc6, waterleaf-icon-theme"
 # PK_RECOMMENDS=""

q4os/installer3.cfg

@@ -0,0 +1,25 @@
+#***q4os*setup*config*header*do*not*delete*it***#
+
+TEMPLATES_DIR_0="$TEMPLATESDIR0"
+TEMPLATES_DIR="."
+
+OUT_DIR="../../.build3_packages/"
+CHKINSTALL_COMMAND="cp -r ../../.build2_fsdeb/out_iconset3-extra/* /usr/share/icons/Waterleaf/"
+INSTALL_PREFIX="/"
+
+PK_NAME="waterleaf-icon-theme-extra"
+# APPNAME_DESC=""
+PK_MAINTAINER="[email protected]"
+# Q4VER_MIN="4.0"
+# Q4VER_MAX="4.9999"
+PK_VERS="20221125-4.3"
+PK_RELEASE="a1"
+PK_DEPENDS="libc6, waterleaf-icon-theme, waterleaf-icon-theme-tde"
+PK_RECOMMENDS="breeze-icon-theme"
+# PK_CONFLICTS="q4os-desktop \(\<\< 3.0\), q4os-desktop \(\>= 4.0\)"
+APPLNK_ENTRY="0"
+MENU_ENTRY="0"
+DESKTOP_ENTRY="0"
+REG_ENTRY="0"
+UNINSTALL_ENTRY="0"
+PK_ARCH="all"