Install overhaul

.github/workflows/build.yml

@@ -21,7 +21,7 @@ jobs:
       matrix:
         config: 
         - {
-            name: "Ubuntu Latest GCC (Release)",
+            name: "Build Dash and dependencies",
             os: ubuntu-latest,
             build_type: "Release",
             cc: "gcc",
@@ -31,26 +31,19 @@ jobs:
 
     steps:
       # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Print env
         run: |
           echo github.event.action: ${{ github.event.action }}
           echo github.event_name: ${{ github.event_name }}
 
       - name: Install dependencies on ubuntu
-        if: startsWith(matrix.config.name, 'Ubuntu Latest GCC')
         run: |
-          sudo apt-get update
+          sudo apt-get update && sudo apt-get upgrade -y
           # sudo apt-get install --no-install-recommends libxkbcommon-x11-0 libgl1-mesa-dev xserver-xorg-video-all xserver-xorg-input-all xserver-xorg-core xinit x11-xserver-utils
-          cmake --version
-          gcc --version
-          
-      - name: Patch install.sh
-        shell: bash
-        run: |
-          sed -i 's/libusb-1.0.0-dev/libusb-1.0-0-dev/g' install.sh
-          sed -i 's/^\s*\.\/dash/\# \.\/dash/g' install.sh
+          # cmake --version
+          # gcc --version
 
       - name: Build
         shell: bash

autostart.sh

@@ -0,0 +1,183 @@
+#!/bin/bash
+
+###
+# Helper scripts for setting autostart methods for Dash application 
+###
+
+display_help() {
+    echo "Autostart install helpers Version 0.3"
+    echo "Usage: $0 [option...]" >&2
+    echo
+    echo "   -adi, --adddesktopicon           Add desktop icon"
+    echo "   -asd, --autostartdaemon          Add autostart daemon"
+    echo "   -axi, --addxinit                 Add xinit autostart"
+    echo "   -h, --help                       Show help of script"
+    echo
+    echo "Example: Add an desktop icon"
+    echo "   helpers.sh -adi"
+    echo
+    echo "Example: Add autostart Systemd daemon"
+    echo "   helpers.sh -asd"
+    echo
+    echo "Example: Add autostart xinit script"
+    echo "   helpers.sh -axi"
+    echo
+    exit 1
+}
+
+
+add_desktop_icon () {
+  # Remove existing opendash desktop
+  if [ -f $HOME/Desktop/dash.desktop ]; then
+    echo "Removing existing shortcut"
+    rm $HOME/Desktop/dash.desktop
+  fi
+
+  # Copy icon to pixmaps folder
+  echo "Copying icon to system directory (requires sudo)"
+  sudo cp -v assets/icons/opendash.xpm /usr/share/pixmaps/opendash.xpm
+
+  # Create shortcut on dashboard
+  echo "Creating desktop shortcut at ~/Desktop/dash.desktop"
+  bash -c "echo '[Desktop Entry]
+Name=Dash
+Comment=Open Dash
+Icon=/usr/share/pixmaps/opendash.xpm
+Exec=$HOME/dash/bin/dash
+Type=Application
+Encoding=UTF-8
+Terminal=true
+Categories=None;
+  ' > $HOME/Desktop/dash.desktop"
+  chmod +x $HOME/Desktop/dash.desktop
+}
+
+create_autostart_daemon() {
+  WorkingDirectory="$HOME/dash"
+  if [[ $2 != "" ]]
+  then
+     WorkingDirectory="$HOME/$2/dash"
+  fi
+  echo ${WorkingDirectory}
+
+  if [ -f "/etc/systemd/system/dash.service" ]; then
+    # Stop and disable dash service
+    echo "Stopping and removing previous service"
+    sudo systemctl stop dash.service || true
+    sudo systemctl disable dash.service || true
+
+    # Remove existing dash service
+    sudo systemctl unmask dash.service || true
+  fi
+  # Write dash service unit
+  echo "Creating Dash service unit" 
+  sudo bash -c "echo '[Unit]
+Description=Dash
+After=graphical.target
+
+[Service]
+Type=idle
+User=$USER
+StandardOutput=inherit
+StandardError=inherit
+Environment=DISPLAY=:0
+Environment=XAUTHORITY=${HOME}/.Xauthority
+WorkingDirectory=${WorkingDirectory}
+ExecStart=${WorkingDirectory}/bin/dash
+Restart=on-failure
+RestartSec=5s
+KillMode=process
+TimeoutSec=infinity
+
+[Install]
+WantedBy=graphical.target
+  ' > /etc/systemd/system/dash.service"
+
+  # Activate and start dash service
+  echo "Enabling and starting Dash service"
+  sudo systemctl daemon-reload
+  sudo systemctl enable dash.service
+  sudo systemctl start dash.service
+  sudo systemctl status dash.service
+}
+
+add_xinit_autostart () {
+  # Install dependencies
+  echo "Installing xinit and Xorg dependencies"
+  sudo apt install -y xserver-xorg xinit x11-xserver-utils
+
+  # Create .xinitrc
+  echo "Creating ~/.xinitrc"
+  cat <<EOT > $HOME/.xinitrc
+#!/usr/bin/env sh
+xset -dpms
+xset s off
+xset s noblank
+
+while [ true ]; do
+  sh $HOME/run_dash.sh
+done
+EOT
+
+  # Create runner
+  echo "Creating ~/run_dash.sh and linking to ~/dash/bin/dash"
+  cat <<EOT > $HOME/run_dash.sh
+#!/usr/bin/env sh
+$HOME/dash/bin/dash >> $HOME/dash/bin/dash.log 2>&1
+sleep 1
+EOT
+
+  # Append to .bashrc
+  echo "Appending startx to ~/.bashrc"
+  cat <<EOT >> $HOME/.bashrc
+
+### xinit
+if [ "\$(tty)" = "/dev/tty1" ]; then
+  startx
+fi
+EOT
+
+}
+
+# Main Menu
+while :
+do
+    case "$1" in
+        -adi | --adddesktopicon)
+            add_desktop_icon
+            exit 0
+          ;;
+        -asd | --autostartdaemon)
+            if [ $# -ne 0 ]; then
+              create_autostart_daemon $2
+              exit 0
+            fi
+          ;;
+        -axi | --addxinit)
+            if [ $# -ne 0 ]; then
+              add_xinit_autostart
+              exit 0
+            fi
+          ;;
+        -h | --help)
+            display_help  # Call your function
+            exit 0
+          ;;
+        "")  # If $1 is blank, run display_help
+            display_help
+            exit 0
+          ;;
+        --) # End of all options
+            shift
+            break
+          ;;
+        -*)
+            echo "Error: Unknown option: $1" >&2
+            ## or call function display_help
+            exit 1
+          ;;
+        *)  # No more options
+            break
+          ;;
+    esac
+done