Bash promt im Fedora Core Style gemacht

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@416 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

config/cfgroot/header.pl

@@ -239,7 +239,7 @@ sub genmenu {
     $subnetwork->{'10.netconf'} = {'caption' => "$tr{'net config'}",
 			        'uri' => '/cgi-bin/netconfig.cgi',
 			        'title' => "$tr{'net config'}",
-			        'enabled' => 1,
+			        'enabled' => 0,
 			        };
     $subnetwork->{'20.proxy'} = {'caption' => 'Webproxy',
 			        'uri' => '/cgi-bin/proxy.cgi',

config/etc/bashrc

@@ -26,7 +26,7 @@ alias ls='ls --color=auto'
 # PS1 Environment Variable for a great case study behind this script
 # addendum.]
 
-#export PS1="[\u@\h \w]\\$ "
-export PS1='\u@\h:\w\$ '
+export PS1="[\u@\h \w]\\$ "
+#export PS1='\u@\h:\w\$ '
 
 # End /etc/bashrc

config/etc/profile

@@ -49,8 +49,8 @@ fi
 # Setup some environment variables.
 export HISTSIZE=1000
 export HISTIGNORE="&:[bf]g:exit"
-#export PS1="[\u@\h \w]\\$ "
-export PS1='\u@\h:\w\$ '
+export PS1="[\u@\h \w]\\$ "
+#export PS1='\u@\h:\w\$ '
 
 for script in /etc/profile.d/*.sh ; do
         if [ -r $script ] ; then

config/profile.d/extra-promt.sh

@@ -1,2 +0,0 @@
-PROMPT_COMMAND='echo -ne "\e[1m${USER}@${HOSTNAME} : ${PWD}\e[0m\a"'
-export PROMPT_COMMAND

config/rootfiles/common/stage2

@@ -25,7 +25,6 @@ etc/nsswitch.conf
 etc/passwd
 etc/profile
 etc/profile.d/dircolors.sh
-etc/profile.d/extra-promt.sh
 etc/profile.d/extrapaths.sh
 etc/profile.d/readline.sh
 etc/profile.d/umask.sh

lfs/moblock

@@ -0,0 +1,81 @@
+###############################################################################
+# This file is part of the IPCop Firewall.                                    #
+#                                                                             #
+# IPCop is free software; you can redistribute it and/or modify               #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation; either version 2 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# IPCop is distributed in the hope that it will be useful,                    #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with IPCop; if not, write to the Free Software                        #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA    #
+#                                                                             #
+# Makefiles are based on LFSMake, which is                                    #
+# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
+#                                                                             #
+###############################################################################
+
+###############################################################################
+# Definitions
+###############################################################################
+
+include Config
+
+VER        = 0.8
+
+THISAPP    = MoBlock-$(VER)
+DL_FILE    = $(THISAPP)-i586.tar.bz2
+DL_FROM    = $(URL_IPFIRE)
+DIR_APP    = $(DIR_SRC)/$(THISAPP)
+TARGET     = $(DIR_INFO)/$(THISAPP)
+
+###############################################################################
+# Top-level Rules
+###############################################################################
+
+objects = $(DL_FILE)
+
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+
+$(DL_FILE)_MD5 = 199967adb48b153be90db10fe21325c5
+
+install : $(TARGET)
+
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+
+md5 : $(subst %,%_MD5,$(objects))
+
+dist: 
+	@$(PAK)
+
+###############################################################################
+# Downloading, checking, md5sum
+###############################################################################
+
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
+	@$(CHECK)
+
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
+	@$(LOAD)
+
+$(subst %,%_MD5,$(objects)) :
+	@$(MD5)
+
+###############################################################################
+# Installation Details
+###############################################################################
+
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
+	@$(PREBUILD)
+	@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+	cd $(DIR_APP) && make
+	cd $(DIR_APP) && make install
+	@rm -rf $(DIR_APP)
+	@$(POSTBUILD)

make.sh

@@ -928,21 +928,19 @@ uploadsrc)
 	PWD=`pwd`
 	cd $BASEDIR/cache/
 	echo -e "Uploading cache to ftp server:"
-	ncftpls -u $FTP_CACHE_USER -p $FTP_CACHE_PASS ftp://$FTP_CACHE_URL$FTP_CACHE_PATH/ > /var/tmp/ftplist
+	ncftpls -u $FTP_CACHE_USER -p $FTP_CACHE_PASS ftp://$FTP_CACHE_URL$FTP_CACHE_PATH/ > /tmp/ftplist
 	for i in *; do
 		if [ "$i" == "toolchains" ]; then continue; fi
-		grep -q $i /var/tmp/ftplist
+		grep -q $i /tmp/ftplist
 		if [ "$?" -ne "0" ]; then
 			echo -ne "$i"
 			ncftpput -u $FTP_CACHE_USER -p $FTP_CACHE_PASS $FTP_CACHE_URL $FTP_CACHE_PATH/ $i
-			if [ "$?" -eq "0" ]; then
-				beautify message DONE
-			else
+			if [ "$?" -ne "0" ]; then
 				beautify message FAIL
 			fi
 		fi
 	done
-	rm -f /var/tmp/ftplist
+	rm -f /tmp/ftplist
 	cd $PWD
 	exit 0
 	;;