From d4bb7820028d824838300ec789057c825b07bd99 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 4 Sep 2011 13:04:45 +0200 Subject: [PATCH] [molecules] rename "XFCE" to "Xfce" --- molecules/sabayon-amd64-xfce.spec | 4 ++-- molecules/sabayon-x86-xfce.spec | 4 ++-- molecules/xfce.common | 4 ++-- scripts/daily_iso_build.sh | 4 ++-- scripts/inner_chroot_script.sh | 2 +- scripts/remaster_generic_inner_chroot_script_after.sh | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/molecules/sabayon-amd64-xfce.spec b/molecules/sabayon-amd64-xfce.spec index f315949..861e4d6 100644 --- a/molecules/sabayon-amd64-xfce.spec +++ b/molecules/sabayon-amd64-xfce.spec @@ -5,10 +5,10 @@ release_version: 6 # Release Version string description -release_desc: amd64 XFCE +release_desc: amd64 Xfce # Path to source ISO file (MANDATORY) source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_6_amd64_XFCE.iso +destination_iso_image_name: Sabayon_Linux_6_amd64_Xfce.iso diff --git a/molecules/sabayon-x86-xfce.spec b/molecules/sabayon-x86-xfce.spec index aa2c553..1913a47 100644 --- a/molecules/sabayon-x86-xfce.spec +++ b/molecules/sabayon-x86-xfce.spec @@ -5,7 +5,7 @@ release_version: 6 # Release Version string description -release_desc: x86 XFCE +release_desc: x86 Xfce # 32bit chroot prechroot: linux32 @@ -14,4 +14,4 @@ prechroot: linux32 source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory -destination_iso_image_name: Sabayon_Linux_6_x86_XFCE.iso +destination_iso_image_name: Sabayon_Linux_6_x86_Xfce.iso diff --git a/molecules/xfce.common b/molecules/xfce.common index 194d4fc..1e32261 100644 --- a/molecules/xfce.common +++ b/molecules/xfce.common @@ -9,7 +9,7 @@ release_string: Sabayon Linux release_file: /etc/sabayon-edition # ISO Image title -iso_title: Sabayon XFCE +iso_title: Sabayon Xfce # Outer chroot script command, to be executed outside destination chroot before # before entering it (and before inner_chroot_script) @@ -33,7 +33,7 @@ error_script: /sabayon/scripts/remaster_error_script.sh extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat # Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh XFCE +pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh Xfce # Post-ISO building script, called after ISO image generation. post_iso_script: /sabayon/scripts/generic_post_iso_script.sh diff --git a/scripts/daily_iso_build.sh b/scripts/daily_iso_build.sh index 446f720..110f219 100755 --- a/scripts/daily_iso_build.sh +++ b/scripts/daily_iso_build.sh @@ -61,8 +61,8 @@ REMASTER_SPECS_ISO=( "Sabayon_Linux_DAILY_x86_K.iso" "Sabayon_Linux_DAILY_amd64_LXDE.iso" "Sabayon_Linux_DAILY_x86_LXDE.iso" - "Sabayon_Linux_DAILY_amd64_XFCE.iso" - "Sabayon_Linux_DAILY_x86_XFCE.iso" + "Sabayon_Linux_DAILY_amd64_Xfce.iso" + "Sabayon_Linux_DAILY_x86_Xfce.iso" "Sabayon_Linux_DAILY_amd64_E17.iso" "Sabayon_Linux_DAILY_x86_E17.iso" "Sabayon_Linux_CoreCDX_DAILY_amd64.iso" diff --git a/scripts/inner_chroot_script.sh b/scripts/inner_chroot_script.sh index 9c4e743..468cad9 100755 --- a/scripts/inner_chroot_script.sh +++ b/scripts/inner_chroot_script.sh @@ -29,7 +29,7 @@ echo "inet_interfaces = localhost" >> /etc/postfix/main.cf # turn bashlogin shells to actual login shells sed -i 's:exec -l /bin/bash:exec -l /bin/bash -l:' /bin/bashlogin -# setup /etc/hosts, add sabayon as default hostname (required by XFCE) +# setup /etc/hosts, add sabayon as default hostname (required by Xfce) sed -i "/^127.0.0.1/ s/localhost/localhost sabayon/" /etc/hosts sed -i "/^::1/ s/localhost/localhost sabayon/" /etc/hosts diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh index 9025fcb..2468853 100755 --- a/scripts/remaster_generic_inner_chroot_script_after.sh +++ b/scripts/remaster_generic_inner_chroot_script_after.sh @@ -193,7 +193,7 @@ elif [ "$1" = "e17" ]; then has_proprietary_drivers && setup_proprietary_gfx_drivers || setup_oss_gfx_drivers elif [ "$1" = "xfce" ]; then setup_networkmanager - # Fix ~/.dmrc to have it load XFCE + # Fix ~/.dmrc to have it load Xfce echo "[Desktop]" > /etc/skel/.dmrc echo "Session=xfce" >> /etc/skel/.dmrc remove_desktop_files