From f52640d7cefb30dcb3706891fabd73dca2f3be32 Mon Sep 17 00:00:00 2001
From: Kevin Gasperich <kgasperich@gmail.com>
Date: Wed, 22 Jun 2022 17:27:59 -0500
Subject: [PATCH] updated etc

---
 etc/cflags.rc |  1 +
 etc/irpf90.rc |  2 +-
 etc/local.rc  |  1 -
 etc/ninja.rc  | 13 -------------
 etc/ocaml.rc  |  6 ++++--
 etc/openmp.rc |  1 +
 etc/paths.rc  |  4 ++--
 etc/qp.rc     |  5 ++++-
 8 files changed, 13 insertions(+), 20 deletions(-)
 create mode 100644 etc/cflags.rc
 delete mode 100644 etc/ninja.rc
 create mode 100644 etc/openmp.rc

diff --git a/etc/cflags.rc b/etc/cflags.rc
new file mode 100644
index 00000000..89ab1d7f
--- /dev/null
+++ b/etc/cflags.rc
@@ -0,0 +1 @@
+export CFLAGS="$CFLAGS --std=gnu99"
diff --git a/etc/irpf90.rc b/etc/irpf90.rc
index 8016edf6..01a8c8a2 100644
--- a/etc/irpf90.rc
+++ b/etc/irpf90.rc
@@ -1,7 +1,7 @@
 # Configuration of IRPF90 package
 
 # Set the path of IRPF90 here:
-export IRPF90_PATH=${QP_ROOT}/external/irpf90-v2.0.0
+export IRPF90_PATH=${QP_ROOT}/external/irpf90
 export PATH=${PATH}:${IRPF90_PATH}/bin
 
 export IRPF90=${IRPF90_PATH}/bin/irpf90
diff --git a/etc/local.rc b/etc/local.rc
index 954b315b..182599c6 100644
--- a/etc/local.rc
+++ b/etc/local.rc
@@ -19,4 +19,3 @@
 # export QP_NIC=lo
 # export QP_NIC=ib0
 
-
diff --git a/etc/ninja.rc b/etc/ninja.rc
deleted file mode 100644
index 0ac28966..00000000
--- a/etc/ninja.rc
+++ /dev/null
@@ -1,13 +0,0 @@
-# Configuration for the Ninja package
-
-export NINJA=${QP_ROOT}/bin/ninja
-
-function ninja () {
-  if [[ -f ${QP_ROOT}/build.ninja ]] ; then
-	${QP_ROOT}/bin/ninja "$@"
-  else
-	>&2 echo "Error: build.ninja does not exists.
-You need to run ./configure  first."
-  fi
-
-}
diff --git a/etc/ocaml.rc b/etc/ocaml.rc
index 1a1e5612..da6de03f 100644
--- a/etc/ocaml.rc
+++ b/etc/ocaml.rc
@@ -4,8 +4,10 @@ if [[ -z $OPAMROOT ]]
 then
 
   # Comment these lines if you have a system-wide OCaml installation
-  export OPAMROOT=${QP_ROOT}/external/opam
-
+  export PATH="${QP_ROOT}/external/ocaml-bundle/bootstrap/bin:$PATH"
+  if [[ -f "${QP_ROOT}/external/ocaml-bundle/bootstrap/bin/opam" ]] ; then
+    eval $(opam env --root "${QP_ROOT}/external/ocaml-bundle/opam" --set-root) 
+  fi
 fi
 source ${OPAMROOT}/opam-init/init.sh > /dev/null 2> /dev/null || true
 
diff --git a/etc/openmp.rc b/etc/openmp.rc
new file mode 100644
index 00000000..7f71c9b8
--- /dev/null
+++ b/etc/openmp.rc
@@ -0,0 +1 @@
+export OMP_NESTED=True
diff --git a/etc/paths.rc b/etc/paths.rc
index 366286d7..84c2d12f 100644
--- a/etc/paths.rc
+++ b/etc/paths.rc
@@ -3,7 +3,7 @@
 QP_PYTHON=
 
 # Load dependencies
-for i in ezfio.rc irpf90.rc ninja.rc ocaml.rc 
+for i in ezfio.rc irpf90.rc ocaml.rc 
 do
   source $i
 done
@@ -34,9 +34,9 @@ export PATH=$(qp_prepend_export "PATH" "${QP_PYTHON}":"${QP_ROOT}"/bin:"${QP_ROO
 
 export LD_LIBRARY_PATH=$(qp_prepend_export "LD_LIBRARY_PATH" "${QP_ROOT}"/lib)
 
-
 export LIBRARY_PATH=$(qp_prepend_export "LIBRARY_PATH" "${QP_ROOT}"/lib:"${QP_ROOT}"/lib64)
 
+export PKG_CONFIG_PATH=$(qp_prepend_export "PKG_CONFIG_PATH" "${QP_ROOT}"/lib/pkgconfig)
 export C_INCLUDE_PATH=$(qp_prepend_export "C_INCLUDE_PATH" "${QP_ROOT}"/include)
 export CPATH=$(qp_prepend_export "CPATH" "${QP_ROOT}"/include)
 
diff --git a/etc/qp.rc b/etc/qp.rc
index 5b2aa9a6..c56661c7 100644
--- a/etc/qp.rc
+++ b/etc/qp.rc
@@ -93,7 +93,7 @@ function qp()
 
     "prompt")
       shift
-      python2 $QP_ROOT/scripts/hello.py
+      python3 $QP_ROOT/scripts/hello.py
       function _check_ezfio() {
         if [[ -d ${EZFIO_FILE} ]] ; then
           printf "\e[0;32m|${EZFIO_FILE}>\e[m"
@@ -204,6 +204,9 @@ _qp_Complete()
           uninstall)
             COMPREPLY=( $(compgen -W "$(qp_plugins list -i)" -- $cur ) )
             return 0;;
+          remove)
+            COMPREPLY=( $(compgen -W "$(qp_plugins list -i)" -- $cur ) )
+            return 0;;
           create)
             COMPREPLY=( $(compgen -W "-n " -- $cur ) )
             return 0;;