Fix #190 epics

container-conf/build.sh

@@ -13,23 +13,13 @@ build_vars() {
 }
 
 build_as_root() {
-    # re2c is for synapps; rpcgen and libtirpc-devel is for asyn
-    install_yum_install \
-        libXt-devel \
-        libtirpc-devel \
-        motif-devel \
-        nodejs \
-        perl-ExtUtils-Command \
-        perl-FindBin \
-        re2c \
-        rpcgen
+    install_yum_install libatomic
 }
 
 build_as_run_user() {
-    set -x
     _slicops_bashrc
-    # sets epics_synapps_dir
-    source epics-install.sh
+    _slicops_nvm_install
+    install_repo_eval epics-area-detector
     _slicops_pkg_install
     _slicops_bin
 }
@@ -41,27 +31,30 @@ export EPICS_BASE=$HOME/.local/epics
 # $EPICS_BASE/startup/EpicsHostArch outputs linux-x86_64; no need to be dynamic here
 export EPICS_HOST_ARCH=linux-x86_64
 bivio_path_insert "$EPICS_BASE/bin/$EPICS_HOST_ARCH"
-
-# for newer nvm
-export NVM_DIR="$HOME/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
-[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
 EOF
     install_source_bashrc
 }
 
 _slicops_bin() {
     build_replace_vars "$build_guest_conf"/slicops-entry.sh "$_slicops_entry"
-    # POSIT: epics-install.sh sets sim_det_dir
+    sim_det_dir=$(find "$EPICS_BASE" -type d -path '*iocBoot/iocSimDetector')
     build_replace_vars "$build_guest_conf"/slicops-demo.sh "$_slicops_demo"
-    # Sanity check that the file contains somethng
+    # Sanity check that the file contains something
     if ! grep sim-detector "$_slicops_demo" &> /dev/null; then
         cat "$_slicops_demo"
         install_err "$_slicops_demo was not generated properly"
     fi
     chmod a+rx "$_slicops_demo" "$_slicops_entry"
 }
 
+_slicops_nvm_install() {
+    # POSIT: same as download/**/codes/common.sh
+    mkdir -p "$NVM_DIR"
+    PROFILE=/dev/null | curl -s -S -L https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
+    install_source_bashrc
+    nvm install 25.6.1
+}
+
 _slicops_pip_install() {
     declare org_and_repo=$1
     declare branch=$2
@@ -78,11 +71,6 @@ _slicops_pkg_install() {
     _slicops_pip_install radiasoft/pykern "$PYKERN_BRANCH"
     _slicops_pip_install slaclab/slicops "$SLICOPS_BRANCH"
     cd slaclab/slicops/ui
-    rm ~/.npmrc
-    # upgrade nvm and node
-    curl -s -S -L https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.3/install.sh | bash
-    source $HOME/.nvm/nvm.sh
-    nvm install node
     npm install
     npm run build
     mv dist ../slicops/package_data/vue