commit: 778d69698e8f12efebb886535c434f3f8621df90
Author: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 2 04:37:37 2015 +0000
Commit: Devan Franchini <twitch153 <AT> gentoo <DOT> org>
CommitDate: Fri Jan 2 04:37:40 2015 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=778d6969
tools-hardened/desktop: Code cleanup for build scripts
Code cleanup is simply replacements of spaces to tabs to make all
lines coincide with one another.
---
tools-hardened/desktop/fluxbox-run.sh | 2 +-
tools-hardened/desktop/gnome3-run.sh | 2 +-
tools-hardened/desktop/run-base.sh | 4 ++--
tools-hardened/desktop/xfce4-run.sh | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools-hardened/desktop/fluxbox-run.sh
b/tools-hardened/desktop/fluxbox-run.sh
index 25fc09d..3d11091 100755
--- a/tools-hardened/desktop/fluxbox-run.sh
+++ b/tools-hardened/desktop/fluxbox-run.sh
@@ -80,7 +80,7 @@ setup_confs() {
main() {
unpack_stage3
mount_dirs
- populate_kernel_src
+ populate_kernel_src
populate_etc
rebuild_toolchain
rebuild_world
diff --git a/tools-hardened/desktop/gnome3-run.sh
b/tools-hardened/desktop/gnome3-run.sh
index 3bffe0c..1ec109d 100755
--- a/tools-hardened/desktop/gnome3-run.sh
+++ b/tools-hardened/desktop/gnome3-run.sh
@@ -71,7 +71,7 @@ setup_confs() {
main() {
unpack_stage3
mount_dirs
- populate_kernel_src
+ populate_kernel_src
populate_etc
rebuild_toolchain
rebuild_world
diff --git a/tools-hardened/desktop/run-base.sh
b/tools-hardened/desktop/run-base.sh
index 120f153..4b4b929 100755
--- a/tools-hardened/desktop/run-base.sh
+++ b/tools-hardened/desktop/run-base.sh
@@ -110,7 +110,7 @@ setup_systemd() {
chroot "${ROOTFS}"/ systemctl enable gdm.service
chroot "${ROOTFS}"/ systemctl enable metalog.service
chroot "${ROOTFS}"/ systemctl enable NetworkManager.service
- chroot "${ROOTFS}"/ systemctl enable systemd-resolved
+ chroot "${ROOTFS}"/ systemctl enable systemd-resolved
chroot "${ROOTFS}"/ systemctl enable postfix.service
chroot "${ROOTFS}"/ systemctl disable gdm
chroot "${ROOTFS}"/ systemctl enable slim
@@ -123,7 +123,7 @@ setup_systemd() {
cleanup_dirs() {
rm -rf "${ROOTFS}"/tmp/*
- rm -rf "${ROOTFS}"/usr/src/*
+ rm -rf "${ROOTFS}"/usr/src/*
rm -rf "${ROOTFS}"/var/cache/*
rm -rf "${ROOTFS}"/var/log/*
rm -rf "${ROOTFS}"/var/tmp/*
diff --git a/tools-hardened/desktop/xfce4-run.sh
b/tools-hardened/desktop/xfce4-run.sh
index 06268aa..9ed5cfd 100755
--- a/tools-hardened/desktop/xfce4-run.sh
+++ b/tools-hardened/desktop/xfce4-run.sh
@@ -33,7 +33,7 @@ setup_usergroups() {
rm -rf "${ROOTFS}"/home/thuser
cp -a thuser "${ROOTFS}"/home/thuser
- sed -i -e 's/^\/usr\/*.*/\/usr\/bin\/startxfce4/'
"${ROOTFS}"/home/thuser//.xinitrc
+ sed -i -e 's/^\/usr\/*.*/\/usr\/bin\/startxfce4/'
"${ROOTFS}"/home/thuser//.xinitrc
cp -a files/{Encrypt,Save,Utilities} "${ROOTFS}"/home/thuser
rm -rf "${ROOTFS}"/home/thuser/Utilities/post_gnome3_install.sh
mkdir -p
"${ROOTFS}"/home/thuser/{Desktop,Documents,Downloads,Music,Pictures,Public,Templates,Videos,.ssh,.cache/dconf,.config/dconf}
@@ -74,7 +74,7 @@ setup_confs() {
main() {
unpack_stage3
mount_dirs
- populate_kernel_src
+ populate_kernel_src
populate_etc
rebuild_toolchain
rebuild_world