From 6fb8ec087635b6773d1a9d13116d63ebde6272fa Mon Sep 17 00:00:00 2001 From: ms Date: Tue, 13 Feb 2007 19:31:38 +0000 Subject: [PATCH] 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 | 2 +- config/etc/bashrc | 4 +- config/etc/profile | 4 +- config/profile.d/extra-promt.sh | 2 - config/rootfiles/common/stage2 | 1 - lfs/moblock | 81 +++++++++++++++++++++++++++++++++ make.sh | 10 ++-- 7 files changed, 90 insertions(+), 14 deletions(-) delete mode 100644 config/profile.d/extra-promt.sh create mode 100644 lfs/moblock diff --git a/config/cfgroot/header.pl b/config/cfgroot/header.pl index a80d5880e4..cedf81e19a 100644 --- a/config/cfgroot/header.pl +++ b/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', diff --git a/config/etc/bashrc b/config/etc/bashrc index e54dc861c2..adf51876c1 100644 --- a/config/etc/bashrc +++ b/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 diff --git a/config/etc/profile b/config/etc/profile index 49e8678c59..3c2921908a 100644 --- a/config/etc/profile +++ b/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 diff --git a/config/profile.d/extra-promt.sh b/config/profile.d/extra-promt.sh deleted file mode 100644 index bf877dc937..0000000000 --- a/config/profile.d/extra-promt.sh +++ /dev/null @@ -1,2 +0,0 @@ -PROMPT_COMMAND='echo -ne "\e[1m${USER}@${HOSTNAME} : ${PWD}\e[0m\a"' -export PROMPT_COMMAND diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index a4b8914d23..5aab2c8301 100644 --- a/config/rootfiles/common/stage2 +++ b/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 diff --git a/lfs/moblock b/lfs/moblock new file mode 100644 index 0000000000..33c25602db --- /dev/null +++ b/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 # +# # +############################################################################### + +############################################################################### +# 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) diff --git a/make.sh b/make.sh index bfc5a1e9f5..d7514aad46 100644 --- a/make.sh +++ b/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 ;; -- 2.39.2