[Rear-users] SF.net SVN: rear:[417] trunk/usr/share/rear/lib

schlomoschapiro at users.sourceforge.net schlomoschapiro at users.sourceforge.net
Sun May 1 23:46:53 CEST 2011


Revision: 417
          http://rear.svn.sourceforge.net/rear/?rev=417&view=rev
Author:   schlomoschapiro
Date:     2011-05-01 21:46:53 +0000 (Sun, 01 May 2011)

Log Message:
-----------
! shell workflow works now properly and is usable

Modified Paths:
--------------
    trunk/usr/share/rear/lib/bashrc.rear
    trunk/usr/share/rear/lib/shell-workflow.sh

Modified: trunk/usr/share/rear/lib/bashrc.rear
===================================================================
--- trunk/usr/share/rear/lib/bashrc.rear	2011-05-01 11:40:58 UTC (rev 416)
+++ trunk/usr/share/rear/lib/bashrc.rear	2011-05-01 21:46:53 UTC (rev 417)
@@ -11,17 +11,18 @@
 # very important for our scripts to work!
 shopt -s nullglob extglob
 
-# setup the rear environment
-test -p $SHELL_VARS_FIFO || echo "ERROR: Could not access the SHELL_VARS_FIFO!"
-eval "$(cat <$SHELL_VARS_FIFO)" 2>/dev/null
+eval "$REAR_EVAL" &>/dev/null
 
+VERBOSE=1
+
 # source in ReaR functions
 for script in $SHARE_DIR/lib/*functions.sh ; do source $script ; done
+source $SHARE_DIR/lib/progresssubsystem.nosh
 
 echo "
 WARNING! This is the interactive shell within $PRODUCT. It
 is intended for development and testing purposed only and
-comes without warranty. The typical usage szenario is to
+comes without warranty. The typical usage scenario is to
 source scriptlets into this shell to test their behaviour.
 
 SHARE_DIR=$SHARE_DIR BUILD_DIR=$BUILD_DIR

Modified: trunk/usr/share/rear/lib/shell-workflow.sh
===================================================================
--- trunk/usr/share/rear/lib/shell-workflow.sh	2011-05-01 11:40:58 UTC (rev 416)
+++ trunk/usr/share/rear/lib/shell-workflow.sh	2011-05-01 21:46:53 UTC (rev 417)
@@ -6,12 +6,7 @@
 		Log "Setting $key=$val"
 	done
 
-	# very clumsy way to export everything
-	#export MODULES PROGS
-	#export ${!A*} ${!B*} ${!C*} ${!D*} ${!E*} ${!F*} ${!G*} ${!H*} ${!I*} ${!J*} ${!K*} ${!L*} ${!M*} ${!N*} ${!O*} ${!P*} ${!Q*} ${!R*} ${!S*} ${!T*} ${!U*} ${!V*} ${!W*} ${!X*} ${!Y*} ${!Z*}
-	mkfifo $TMP_DIR/rear-shell.fifo
-	export SHELL_VARS_FIFO=$TMP_DIR/rear-shell.fifo
-	declare -p >$SHELL_VARS_FIFO </dev/null &
+	export REAR_EVAL="$(declare -p | sed -e 's/^declare .. //' -e '/MASKS=/d' )" 
 	bash --rcfile $SHARE_DIR/lib/bashrc.rear -i 2>&1
 	
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the rear-users mailing list