[sabayon] xinitrc files are .'d, shouldn't be shebanged, and sed wasn't replacing all variables in line due to



commit e05fbc8b017808a24874a24c4afad023afaa8306
Author: Scott Balneaves <sbalneav ltsp org>
Date:   Tue Feb 9 11:51:05 2010 -0600

    xinitrc files are .'d, shouldn't be shebanged, and sed wasn't replacing all variables in line due to no g

 admin-tool/Makefile.am           |    4 ++--
 admin-tool/sabayon-xinitrc.sh.in |    2 --
 2 files changed, 2 insertions(+), 4 deletions(-)
---
diff --git a/admin-tool/Makefile.am b/admin-tool/Makefile.am
index 87138ea..4e4bf65 100644
--- a/admin-tool/Makefile.am
+++ b/admin-tool/Makefile.am
@@ -45,8 +45,8 @@ sabayon_PYTHON = $(PYTHON_FILES)
 
 %.sh: %.sh.in
 	sed                                             \
-		-e s!\ SBINDIR\@!$(sbindir)!            \
-		-e s!\ SCONFDIR\@!$(sysconfdir)!        \
+		-e s!\ SBINDIR\@!$(sbindir)!g            \
+		-e s!\ SCONFDIR\@!$(sysconfdir)!g        \
 		< $< > $@
 	chmod a+x $@
 
diff --git a/admin-tool/sabayon-xinitrc.sh.in b/admin-tool/sabayon-xinitrc.sh.in
index 95af1fc..57b3f10 100755
--- a/admin-tool/sabayon-xinitrc.sh.in
+++ b/admin-tool/sabayon-xinitrc.sh.in
@@ -1,5 +1,3 @@
-#!/bin/bash
-
 #
 # Apply the Sabayon profile for the current user (if any)
 #



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]