squash-me

install/linux/install.sh

@@ -23,16 +23,18 @@ if [[ "cprev_allow_reinstall" == 'yes' ]]; then
 fi
 
 rm -rf "$HOME/.cprev"
-
 mkdir -p "$HOME/.cprev/conf"
 mkdir -p "$HOME/.cprev/lib"
 mkdir -p "$HOME/.cprev/sockets"
+mkdir -p "$HOME/.local/bin"
 
 cd "$HOME/.cprev"
 git clone 'git@github.com:cprev/cprev.git' "$HOME/.cprev/lib"
 
 cd "$HOME/.cprev/lib" && git checkout master
 
+
+
 ln -sf "$HOME/.cprev/lib/dist/client/main.js" "$HOME/.local/bin/cprev-agent"
 chmod +x "$HOME/.local/bin/cprev-agent"
 

install/linux/local-test-install.sh

@@ -25,6 +25,9 @@ mkdir -p "$HOME/.cprev/sockets"
   ln -sf "$PWD" "$HOME/.cprev/lib"
 )
 
+
+mkdir -p "$HOME/.local/bin"
+
 ln -sf "$HOME/.cprev/lib/dist/client/main.js" "$HOME/.local/bin/cprev-agent"
 chmod +x "$HOME/.local/bin/cprev-agent"
 

install/macos/local-test-install.sh

@@ -1,41 +1,48 @@
 #!/usr/bin/env bash
 
 set -eo pipefail;
-cd "$(dirname "$BASH_SOURCE")"
 
 if [[ $EUID -eq 0 ]]; then
    echo 'Refusing to install cprev as root user.'
    exit 1
 fi
 
 rm -rf "$HOME/.cprev"
-
 mkdir -p "$HOME/.cprev/conf"
 mkdir -p "$HOME/.cprev/sockets"
 
-
 (
-  cd "$(dirname "$(dirname "$(dirname "$BASH_SOURCE")")")";
 
-  if [[ ! -d .git ]]; then
-     echo 'Did not cd into correct directory.';
+  if [[ ! -d '.git' ]]; then
+     echo 'Did not cd into correct directory, we are here:' "$PWD";
+     exit 1;
+  fi
+
+  if [[ ! -f 'readme.md' ]]; then
+     echo 'Did not cd into correct directory, we are here:' "$PWD";
      exit 1;
   fi
 
   ln -sf "$PWD" "$HOME/.cprev/lib"
 )
 
+mkdir -p "$HOME/.local/bin"
+
 ln -sf "$HOME/.cprev/lib/dist/client/main.js" "$HOME/.local/bin/cprev-agent"
 chmod +x "$HOME/.local/bin/cprev-agent"
 
-ln -sf "$HOME/.cprev/lib/install/linux/start.sh" "$HOME/.local/bin/cprev-safe-start"
+ln -sf "$HOME/.cprev/lib/install/macos/start.sh" "$HOME/.local/bin/cprev-safe-start"
 chmod +x "$HOME/.local/bin/cprev-safe-start"
 
 
-sudo rsync "$PWD/systemd.service" "/etc/systemd/system/cprev.agent.service"
+#sudo rsync "$PWD/systemd.service" "/etc/systemd/system/cprev.agent.service"
+
+rm -f "$HOME/Library/LaunchAgents/org.ores.cprev.plist" || echo 'no rm necessary'
+
+rsync "$PWD/install/macos/org.ores.cprev.plist" "$HOME/Library/LaunchAgents/org.ores.cprev.plist"
 
-node write-config.js
+node install/macos/write-config.js
 echo 'installed successfully (local installation).';
 
 echo 'To restart the systemd service, use:'
-echo 'systemctl restart cprev.agent.service'
+echo 'launchctl load "$HOME/Library/LaunchAgents/org.ores.cprev.plist"'

install/macos/org.ores.cprev.plist

@@ -4,11 +4,12 @@
 <dict>
         <key>Label</key>
         <string>org.ores.cprev</string>
+        <key>Program</key>
+        <string>/Users/alex/.local/bin/cprev-safe-start</string>
         <key>ProgramArguments</key>
          <array>
-          <string>/Users/alex/.local/bin/cprev-agent-start</string>
+          <string>/Users/alex/.local/bin/cprev-safe-start</string>
           <string>--foo</string>
-          <string>bar</string>
          </array>
          <key>RunAtLoad</key>
           <true/>
@@ -18,8 +19,8 @@
               <true/>
           </dict>
         <key>StandardErrorPath</key>
-        <string>/tmp/cprev.stderr.log</string>
-        <key>StandardOutPath</key>
-        <string>/tmp/cprev.stdout.log</string>
+          <string>/tmp/cprev.stderr.log</string>
+          <key>StandardOutPath</key>
+          <string>/tmp/cprev.stdout.log</string>
 </dict>
 </plist>

install/macos/org.ores.cprev.tmp.plist

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+        <key>Label</key>
+        <string>org.ores.cprev</string>
+        <key>ProgramArguments</key>
+         <array>
+          <string>/Users/alex/.local/bin/cprev-safe-start</string>
+          <string>--foo</string>
+          <string>bar</string>
+         </array>
+         <key>RunAtLoad</key>
+          <true/>
+         <key>KeepAlive</key>
+          <dict>
+              <key>SuccessfulExit</key>
+              <true/>
+          </dict>
+        <key>StandardErrorPath</key>
+        <string>/tmp/cprev.stderr.log</string>
+        <key>StandardOutPath</key>
+        <string>/tmp/cprev.stdout.log</string>
+</dict>
+</plist>

install/macos/start.sh

@@ -1,9 +1,17 @@
 #!/usr/bin/env bash
 
-set -eo pipefail;
+
+set +eo pipefail;
+
+export cprev_user_uuid=333
 
 (
-    current_node_version="$(node --version 2> /dev/null)"
+    set -e;
+
+    command -v node || echo 'no node installed'
+    command -v nvm || echo 'no nvm installed'
+
+    current_node_version="$(node --version 2> /dev/null || echo)"
 
     if [[ "$current_node_version" != 'v13.11'* ]]; then
       echo 'Installing nvm in order to install nodejs...'
@@ -14,8 +22,8 @@ set -eo pipefail;
          exit 1;
       fi
 
-      export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
-      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+      export NVM_DIR="$HOME/.nvm"
+      [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"  # This loads nvm
 
        echo 'Installing nodejs v13.11 via nvm...'
        nvm install '13.11'   # &&   nvm use '13.11'
@@ -24,3 +32,8 @@ set -eo pipefail;
 
     node "$HOME/.local/bin/cprev-agent"
 )
+
+exit_code="$?"
+
+echo "cprev agent is exiting with code: '$exit_code'"
+exit "$exit_code";