env: cleanup and comments

Signed-off-by: Øyvind Harboe <[email protected]>

Author: oharboe

dev_env.sh

@@ -1,9 +1,15 @@
 #!/usr/bin/env bash
-
-function setpaths() {
+#
+# Set developer paths and environment variables here,
+# user settings go in ./env.sh
+function __setpaths() {
     local DIR=$(readlink -f "$(dirname "${BASH_SOURCE[0]}")")
     export PATH="$DIR/dependencies/bin:$PATH"
     export CMAKE_INSTALL_RPATH=$DIR/dependencies/lib:$DIR/dependencies/lib64
-}
 
-setpaths
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+        export CMAKE_PREFIX_PATH="$(brew --prefix or-tools)"
+    fi
+}
+__setpaths
+unset -f __setpaths

env.sh

@@ -1,24 +1,29 @@
-if [[ "$OSTYPE" == "darwin"* ]]; then
-  DIR="$(dirname $(perl -e 'use Cwd "abs_path";print abs_path(shift)' "${BASH_SOURCE[0]}"))"
-else
-  DIR="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
-fi
+#!/usr/bin/env bash
+function __setpaths() {
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+    DIR="$(dirname $(perl -e 'use Cwd "abs_path";print abs_path(shift)' "${BASH_SOURCE[0]}"))"
+  else
+    DIR="$(dirname $(readlink -f "${BASH_SOURCE[0]}"))"
+  fi
 
-if [ -f /opt/rh/rh-python38/enable ]; then
-  source /opt/rh/rh-python38/enable
-fi
+  if [ -f /opt/rh/rh-python38/enable ]; then
+    source /opt/rh/rh-python38/enable
+  fi
 
-export OPENROAD=${DIR}/tools/OpenROAD
-echo "OPENROAD: ${OPENROAD}"
+  export OPENROAD=${DIR}/tools/OpenROAD
+  echo "OPENROAD: ${OPENROAD}"
 
-export PATH=${DIR}/dependencies/bin:$PATH
-export PATH=${DIR}/tools/install/OpenROAD/bin:$PATH
-export PATH=${DIR}/tools/install/yosys/bin:$PATH
+  # Set user paths and environment variables here,
+  # developer settings go in ./dev_env.sh
+  export PATH=${DIR}/tools/install/OpenROAD/bin:$PATH
+  export PATH=${DIR}/tools/install/yosys/bin:$PATH
 
-if [[ "$OSTYPE" == "darwin"* ]]; then
-  export PATH="/Applications/KLayout/klayout.app/Contents/MacOS:$PATH"
-  export PATH="$(brew --prefix bison)/bin:$(brew --prefix flex)/bin:$(brew --prefix tcl-tk)/bin:$PATH"
-  export CMAKE_PREFIX_PATH="$(brew --prefix or-tools)"
-fi
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+    export PATH="/Applications/KLayout/klayout.app/Contents/MacOS:$PATH"
+    export PATH="$(brew --prefix bison)/bin:$(brew --prefix flex)/bin:$(brew --prefix tcl-tk)/bin:$PATH"
+  fi
 
-export FLOW_HOME=$DIR/flow
+  export FLOW_HOME=$DIR/flow
+}
+__setpaths
+unset -f __setpaths