From ac9eb4b0ad6afc35d32bb8fd2c0c6c1d02e63778 Mon Sep 17 00:00:00 2001
From: Takuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Date: Tue, 17 Nov 2015 08:20:36 +0900
Subject: [PATCH] 	modified:   env/Eos_env 	modified:  
 env/install-eos.sh 	modified:   env/update-eos.sh

---
 env/Eos_env        |  6 ++---
 env/install-eos.sh |  4 +++
 env/update-eos.sh  | 71 ++++++++++++++++++++++++++++++++++++------------------
 3 files changed, 54 insertions(+), 27 deletions(-)

diff --git a/env/Eos_env b/env/Eos_env
index e1e0a3c50f..5b3d69516b 100755
--- a/env/Eos_env
+++ b/env/Eos_env
@@ -13,9 +13,9 @@ fi
 
 #
 # Eos
-if [ -z "$EOS_GITUSER0" ] ; then
-	export EOS_GITUSER=
-else
+if [ -z $EOS_GITUSER0 ] ; then
+	export EOS_GITUSER=$USER
+else 
 	export EOS_GITUSER=$EOS_GITUSER0
 fi
 
diff --git a/env/install-eos.sh b/env/install-eos.sh
index 52b024b9ca..f7396b988c 100755
--- a/env/install-eos.sh
+++ b/env/install-eos.sh
@@ -204,6 +204,10 @@ if [ -d $EOS_HOME0/hostdepend ] ; then
 			git clone --depth 1 ${HOSTDEPEND_EOS_OSDN_SSH} ${EOS_HOSTDIR} || \
 			git clone --depth 1 ${HOSTDEPEND_EOS_OSDN_HTTPS} ${EOS_HOSTDIR} || \
 			echo "A port for SSH or HTTPS is not open, or something wrong."
+ 			cd ${EOS_HOSTDIR}; \
+ 			git clone --unshallow ${HOSTDEPEND_EOS_OSDN_SSH} || \
+ 			git clone --unshallow 1 ${HOSTDEPEND_EOS_OSDN_HTTPS} || \
+ 			echo "cannot --unshallow something wrong."
 			INSTALL_FLAG=INSTALL
 		fi
 		if [ -z $INSTALL_FLAG ] ; then
diff --git a/env/update-eos.sh b/env/update-eos.sh
index b8ec7d9566..4032b71c14 100755
--- a/env/update-eos.sh
+++ b/env/update-eos.sh
@@ -1,39 +1,62 @@
 #!/bin/sh
 WD=`pwd`
 
-if [ -z $EOS_HOME ] ; then
-	echo "Please set an environment for Eos using $source env/Eos_env."
-	exit
+if [ -z $EOS_HOME0 ] ; then
+	echo "Please set an environment for Eos."
+	echo " $ export EOS_HOME0=InstalledDirOfEos"
+	exit 1
 fi
 
-echo "Do you have a git account for OSDN [Y or N] ?"; read ANS
-if [ $ANS == "N" ] ; then
-    export EOS_GITUSER=
-elif [ $ANS == "Y" ] ; then
-    unset ANS
-    echo "Set the git account for OSDN [$EOS_GITUSER]: "; read ANS
-    if [ ! -z $ANS ] ; then
-        export EOS_GITUSER=$ANS
-    fi
+echo "EOS_HOME0:    $EOS_HOME0"
+if [ -z $EOS_GITUSER0 ] ; then
+echo "EOS_GITUSER0: NoGitAccount"
 else
-    echo "Please run install-eos.sh again!"
-    exit
+echo "EOS_GITUSER0: $EOS_GITUSER0"
 fi
 
-echo "Directory:   $EOS_HOME0"
-echo "GIT Account: $EOS_GITUSER"
 unset ANS
-echo "Are these parameters OK [Y|N]? "; read ANS
+echo "Is is OK ? [Y|y or N|n]"; read ANS
+case $ANS in
+	Y|y)
+		;;	
+	*)
+		echo " $ export EOS_HOME0=InstalledDirOfEos"
+		echo " $ export EOS_GITUSER0=GitUserForOSDN"
+		echo "      or "
+		echo " $ export EOS_GITUSER0="
+		echo " $ $0"
+		;;
+esac
 
-if [ $ANS == "Y" ] ; then
-    echo "Directory:   $EOS_HOME0"
-    if [ -z EOS_GITUSER
-    echo "GIT Account: $EOS_GITUSER"
-else
-    echo "Please run install-eos.sh again!"
-    exit
+#
+# profile update
+#
+awk 'BEGIN {EOS="no"} {if($0=="## Eos_env Start") EOS="yes"; if(EOS!="yes") print $0;if($0=="## Eos_env End") EOS="no"; }' $HOME/.bash_profile > $HOME/.bash_profile.org
+
+cat $HOME/.bash_profile.org > $HOME/.bash_profile
+cat >> $HOME/.bash_profile << EOF 
+## Eos_env Start
+##
+
+if [ ! -z $EOS_HOME0 ] ; then 
+    if [ -f $EOS_HOME0/env/Eos_env -a ! -f $HOME/.Eos_env ] ; then
+        ln -s $EOS_HOME0/env/Eos_env $HOME/.Eos_env
+    fi  
 fi
 
+export EOS_HOME=$EOS_HOME0
+export EOS_GITUSER0=$EOS_GITUSER0
+
+test -r $HOME/.Eos_env  && . $HOME/.Eos_env
+
+##
+## Eos_env End 
+EOF
+
+
+EOS_HOME=$EOS_HOME0
+EOS_GITUSER=$EOS_GITUSER0
+
 ROOT_EOS_OSDN_GIT=git://git.osdn.jp/gitroot/eos/base.git
 ROOT_EOS_OSDN_HTTP=http://scm.osdn.jp/gitroot/eos/base.git
 ROOT_EOS_OSDN_SSH=${EOS_GITUSER}@git.osdn.jp:/gitroot/eos/base.git
-- 
2.11.0