mlds-notebook-Sam 9 jui 2018 03:37:15 CEST

Author: lucas iscovici

bashCmd.zip

@@ -8,9 +8,10 @@ define shell-functions
 
 : END
 endef
-
+mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
+current_dir := $(notdir $(patsubst %/,%,$(dir $(mkfile_path))))
 # Generate the file with function declarations for the shell
-$(shell sed -n '/^: BEGIN/,/^: END/p' ./Makefile > .functions.sh && chmod 777  .functions.sh)
+$(shell sed -n '/^: BEGIN/,/^: END/p' "${mkfile_path}" > .functions.sh && chmod 777  .functions.sh)
 
 SHELL := /bin/bash --init-file .functions.sh -i
 
@@ -106,7 +107,7 @@ help:
 
 mlds:
 	@if [[ -z "${help}" || ( "${help}" != "no" && "${help}" != "false" && "${help}" != "f") ]]; then \
-		make help; \
+		make -f "${mkfile_path}" help; \
 	else if [[ $(shell echo \"$(shell test -f "getP" && echo "true" || echo "false")\") = "true" ]]; then \
 	getP=./getP ;\
 	elif [[ $(shell test -f \"../getP\" && echo \"true\" || echo \"false\") = "true" ]];then \
@@ -127,7 +128,7 @@ h=$$($$getP ${portSparkRestMin} ${portSparkRestMax} 2> /dev/null) && \
 i=$$(($$g+${portSparkContextENbX})) && \
 l=$$(($$c+${portH2oNbX})) && \
 	 test -z $$getP  && echo "Error ------ getP"  || (\
-	(test ${printCommand} = "yes" && test "${quiet}" = "noj" ) && echo 'docker run ${jname} "${debug}" "${run_rm}" ${j} ${jj} -p "'$$( echo $$d)':${portSpark}" -p "'$$( echo $$g)'-'$$( echo $$i)':${portSparkContextB}-${portSparkContextE}" -p "'$$( echo $$h)':${portSparkRest}" -p "'$$( echo $$f)':${portSparkSlave}" -p "'$$( echo $$e)':${portSparkMaster}" -p "'$$( echo $$a)':${portNb}" -p "'$$( echo $$b)':${portTensorBoard}" -p "'$$( echo $$c)'-'$$( echo $$l)':${portH2o}" ${more} "${image}" ${cmd}' || true ) && make a=$$a b=$$b c=$$c d=$$d e=$$e f=$$f g=$$g h=$$h i=$$i l=$$l _mlds; \
+	(test ${printCommand} = "yes" && test "${quiet}" = "noj" ) && echo 'docker run ${jname} "${debug}" "${run_rm}" ${j} ${jj} -p "'$$( echo $$d)':${portSpark}" -p "'$$( echo $$g)'-'$$( echo $$i)':${portSparkContextB}-${portSparkContextE}" -p "'$$( echo $$h)':${portSparkRest}" -p "'$$( echo $$f)':${portSparkSlave}" -p "'$$( echo $$e)':${portSparkMaster}" -p "'$$( echo $$a)':${portNb}" -p "'$$( echo $$b)':${portTensorBoard}" -p "'$$( echo $$c)'-'$$( echo $$l)':${portH2o}" ${more} "${image}" ${cmd}' || true ) && make -f "${mkfile_path}" a=$$a b=$$b c=$$c d=$$d e=$$e f=$$f g=$$g h=$$h i=$$i l=$$l _mlds; \
 	fi
 
 _mlds:

bashCmd/Makefile

@@ -37,7 +37,7 @@ else
 		alias _exit="builtin exit"
 		alias _docker="docker"
 		export _dockerP=$(which docker)
-		export PATH="$(pwd):$PATH";
+		export PATH="$(which envStart.sh)/cmd:$PATH";
 		export OLD_PS1="SETTED";
 		if _check.sh "$sl"; then
 			curr="*"

bashCmd/envStart.sh

@@ -4,8 +4,8 @@ dkd="$(confImgRun.sh)"
 # echo "DEBUG $dkd"
 pdof=\"$(cat .mldsEnv | sed -En "/^__.*/p" | sed -En "s/__(.*)/\1/p"  | tr '\n' ' ')\"
 
-#echo make mlds $(echo $dkd | tr -d '"' ) $(echo $pdof | tr -d '"' )    $@
-make mlds -f "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/Makefile"  $(echo $pdof | tr -d '"' ) $(echo $dkd | tr -d '"' )  "$@"
+echo make -f "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/Makefile" mlds 
+make mlds -f "$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/Makefile" mlds $(echo $pdof | tr -d '"' ) $(echo $dkd | tr -d '"' )  "$@"
 
 else
 

bashCmd/run.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 . ~/.bashrc
 if [[ -n `which curl` ]];then
-	rm -rf bashCmd.zip && rm -rf bashCmd && curl -s https://raw.githubusercontent.com/luluperet/mlds-notebook/master/bashCmd.zip -o bashCmd.zip && unzip -q bashCmd.zip && rm -rf bashCmd.zip && ( [[ ! -d ~/.mlds ]] && mkdir ~/.mlds  || true) && mv bashCmd/* ~/.mlds/ && ([[ -z "$(which envStart.sh)" ]] && ( echo "PATH=$HOME/.mlds:$PATH" >> ~/.bashrc && export PATH="$HOME/.mlds:$PATH") || true ) &&  rm -rf bashCmd  && echo -e 'BashCmd installed !!!\nFor begin to Work:\n\t$ ./envStart.sh <name_futur_container_u_want>\nFor see help:\n\t$ make or $ make help or $ make mlds help=\n'  || echo "pb"
+	rm -rf bashCmd.zip && rm -rf bashCmd && curl -s https://raw.githubusercontent.com/luluperet/mlds-notebook/master/bashCmd.zip -o bashCmd.zip && unzip -q bashCmd.zip && rm -rf bashCmd.zip && ( [[ ! -d ~/.mlds || ! -d ~/.mlds/cmd ]] && mkdir -p ~/.mlds/cmd  || true) && mv bashCmd/* ~/.mlds/cmd && mv ~/.mlds/cmd/envStart.sh ~/.mlds/ && ([[ -z "$(which envStart.sh)" ]] && ( echo "PATH=$HOME/.mlds:$PATH" >> ~/.bashrc && export PATH="$HOME/.mlds:$PATH") || true ) &&  rm -rf bashCmd  && echo -e 'BashCmd installed !!!\nFor begin to Work:\n\t$ ./envStart.sh <name_futur_container_u_want>\nFor see help:\n\t$ make or $ make help or $ make mlds help=\n'  || echo "pb"
 else
 	echo "OU EST CURL !!!"
 fi