improvements

setenv

@@ -3,16 +3,38 @@
 export RUNNER_UID=`id -u`
 export RUNNER_GID=`id -g`
 
-# link to gitlab-runner env files if exists ####
+
 CI_PROJECT_NAME=${PWD##*/}
 
-F=`ls -p ../${CI_PROJECT_NAME}.tmp | grep -v /`
+F=`ls -p ./env | grep -v /`
 for f in $F
 do
-   # export ${f}=${PWD}/../${CI_PROJECT_NAME}.tmp/${f}
-   echo ${f}=${PWD}/../${CI_PROJECT_NAME}.tmp/${f} > ./env/${f}
+    v=`echo -n ${!f}`
+    if [ "${!f}" != "" ]
+    then
+      echo "${f}=${!f}" > ./env/${f}
+    fi
 done
 
+if [[ -d "./env_file" ]]
+then
+  F=`ls -p ./env_file | grep -v /`
+  for f in $F
+  do
+     echo ${f}=./env_file/${f} > ./env/${f}
+  done
+fi
+
+# link to gitlab-runner env files if exists ####
+if [[ -d "../${CI_PROJECT_NAME}.tmp" ]]
+then
+  F=`ls -p ../${CI_PROJECT_NAME}.tmp | grep -v /`
+  for f in $F
+  do
+     echo ${f}=${PWD}/../${CI_PROJECT_NAME}.tmp/${f} > ./env/${f}
+  done
+fi
+
 # export env vars
 export `cat ./env/*`