diff --git a/build-iso-abf.sh b/build-iso-abf.sh index 9183162..27a4a6d 100755 --- a/build-iso-abf.sh +++ b/build-iso-abf.sh @@ -6,20 +6,20 @@ set -u set +f BUILD_ID="${BUILD_ID:-XXX}" -FS_LABEL="ROSA_2019.1_LXQt_Min_Test_${BUILD_ID}" +FS_LABEL="ROSA_2019.1_XFCE_Min_Test_${BUILD_ID}" # TODO: make everything universal for all arches AARCH64="${AARCH64:-0}" SLEEP="${SLEEP:-0}" conf="$(mktemp)" -cp lxqt.ks "$conf" +cp XFCE.ks "$conf" repobase="$(mktemp)" cp repobase.ks "$repobase" pkgs="$(mktemp)" -cp lxqtpack.ks "$pkgs" +cp packages.ks "$pkgs" if [ "$AARCH64" = 1 ] ; then - FS_LABEL="ROSA_2019.1_LXQt_aarch64_${BUILD_ID}" + FS_LABEL="ROSA_2019.1_XFCE_aarch64_${BUILD_ID}" # temp, better make one universal list cp repobase-aarch64.ks "$repobase" # temporary hack of kernel @@ -41,7 +41,7 @@ if [ "$AARCH64" = 1 ] ; then fi sed -i -e "s,repobase.ks,${repobase},g" "$conf" -sed -i -e "s,lxqtpack.ks,${pkgs},g" "$conf" +sed -i -e "s,packages.ks,${pkgs},g" "$conf" sleep "$SLEEP" diff --git a/lxqt.ks b/main.ks similarity index 99% rename from lxqt.ks rename to main.ks index fd65ac2..5c3e6ab 100644 --- a/lxqt.ks +++ b/main.ks @@ -23,7 +23,7 @@ keyboard en %include repobase.ks %packages --nocore -%include lxqtpack.ks +%include packages.ks %end %post diff --git a/lxqtpack.ks b/packages.ks similarity index 100% rename from lxqtpack.ks rename to packages.ks