[gentoo-commits] proj/releng:master commit in: tools-hardened/desktop/

[Devan Franchini]

commit:     6b03011ea2d14a5743c07e6591d60d364acf1112
Author:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 15 19:20:12 2015 +0000
Commit:     Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Sun Mar 15 19:20:15 2015 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=6b03011e

tools-hardened/desktop Cleans up code of .sh files

This clean-up includes removing trailing white-spaces and ensuring
function structure consistency.

 tools-hardened/desktop/fluxbox-run.sh |  2 +-
 tools-hardened/desktop/make.sh        | 14 +++++---------
 tools-hardened/desktop/run-base.sh    |  3 +--
 tools-hardened/desktop/xfce4-run.sh   |  4 ++--
 4 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/tools-hardened/desktop/fluxbox-run.sh 
b/tools-hardened/desktop/fluxbox-run.sh
index e0d34e1..c2f058a 100755
--- a/tools-hardened/desktop/fluxbox-run.sh
+++ b/tools-hardened/desktop/fluxbox-run.sh
@@ -54,7 +54,7 @@ setup_usergroups() {
 
 setup_confs() {
        local 
IMAGE="http://dev.gentoo.org/~blueness/lilblue/gentoo1600x1200.jpg";
-    
+
        sed -i 's/^\(DISPLAYMANAGER="\)xdm/\1slim/' "${ROOTFS}"/etc/conf.d/xdm
        sed -i 's/^\(login.*\)/# \1/' "${ROOTFS}"/etc/slim.conf
        sed -i '/# login_cmd.*Xsession/ a\login_cmd exec /bin/bash -login 
~/.xinitrc' "${ROOTFS}"/etc/slim.conf

diff --git a/tools-hardened/desktop/make.sh b/tools-hardened/desktop/make.sh
index aae8565..73671a9 100755
--- a/tools-hardened/desktop/make.sh
+++ b/tools-hardened/desktop/make.sh
@@ -4,8 +4,7 @@ WORKING=$(pwd)
 CHROOTS=${CHROOTS:-"${WORKING}"}
 MYROOT=${MYROOT:-""}
 
-cleanup()
-{
+cleanup() {
        cd ${WORKING}
        rm -f ramdisk.iso
        rm -f tinhat.igz
@@ -14,8 +13,7 @@ cleanup()
 }
 
 
-mkinitramfs()
-{
+mkinitramfs() {
        local BUSYBOX="http://dev.gentoo.org/~twitch153/tinhat/busybox";
 
        cd ${WORKING}
@@ -27,7 +25,7 @@ mkinitramfs()
        wget -O ${WORKING}/init/bin/busybox "${BUSYBOX}"
        cp ../configs/init .
        chmod 755 bin/busybox
-       chmod 755 init 
+       chmod 755 init
 
        chroot . /bin/busybox --install -s
 
@@ -38,8 +36,7 @@ mkinitramfs()
 }
 
 
-mkiso()
-{
+mkiso() {
        cd ${WORKING}
        mkdir -p iso/boot/grub
 
@@ -57,8 +54,7 @@ mkiso()
 }
 
 
-nameit()
-{
+nameit() {
        DATE=$(date +%Y%m%d)
        NAME="${MYROOT}-${DATE}.iso"
 

diff --git a/tools-hardened/desktop/run-base.sh 
b/tools-hardened/desktop/run-base.sh
index a326424..593e93e 100755
--- a/tools-hardened/desktop/run-base.sh
+++ b/tools-hardened/desktop/run-base.sh
@@ -13,8 +13,7 @@ mount_dirs() {
        mount --rbind /sys/ "${ROOTFS}"/sys/
 }
 
-populate_kernel_src()
-{
+populate_kernel_src() {
        cp -f files/kernel-config "${KERNEL_SOURCE}"
        cp -Rf "${KERNEL_SOURCE}"/ "${ROOTFS}"/usr/src/
 }

diff --git a/tools-hardened/desktop/xfce4-run.sh 
b/tools-hardened/desktop/xfce4-run.sh
index 9ed5cfd..6a9cfba 100755
--- a/tools-hardened/desktop/xfce4-run.sh
+++ b/tools-hardened/desktop/xfce4-run.sh
@@ -48,7 +48,7 @@ setup_usergroups() {
 
 setup_confs() {
        local 
IMAGE="http://dev.gentoo.org/~blueness/lilblue/gentoo1600x1200.jpg";
-    
+
        sed -i 's/^\(DISPLAYMANAGER="\)xdm/\1slim/' "${ROOTFS}"/etc/conf.d/xdm
        sed -i 's/^\(login.*\)/# \1/' "${ROOTFS}"/etc/slim.conf
        sed -i '/# login_cmd.*Xsession/ a\login_cmd exec /bin/bash -login 
~/.xinitrc' "${ROOTFS}"/etc/slim.conf
@@ -67,7 +67,7 @@ setup_confs() {
        chroot "${ROOTFS}"/ locale-gen
        chroot "${ROOTFS}"/ eselect locale set en_US.utf8
        cp -a files/locale/02locale "${ROOTFS}"/etc/conf.d/
-       # In kernels 3.9 and above, we must disallow-other-stacks because of 
SO_REUSEPORT 
+       # In kernels 3.9 and above, we must disallow-other-stacks because of 
SO_REUSEPORT
        sed -i 's/^#\(disallow-other-stacks=\)no/\1yes/g' 
"${ROOTFS}"/etc/avahi/avahi-daemon.conf
 }