install script updates

install-linux.sh

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+
+echo "Building Napture..."
+
+
+# Install dependencies based on linux distro
+
+# Check for /etc/os-release file
+if [ -f /etc/os-release ]; then
+    # Extract and print the PRETTY_NAME value
+    PRETTY_NAME=$(grep '^PRETTY_NAME=' /etc/os-release | cut -d '=' -f2- | tr -d '"')
+    echo "Detected: $PRETTY_NAME"
+    if [[ $PRETTY_NAME == "Ubuntu 24.04 LTS" ]]; then
+        echo  "Installing dependencies..."
+        sudo apt-get update
+        sudo apt-get install curl git build-essential libssl-dev libglib2.0-dev libcairo2-dev libgraphene-1.0-dev libgtk-4-dev libadwaita-1-dev liblua5.4-dev
+        curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
+        echo "Dependencies installed."
+    else
+        echo "Could not detect the Linux distribution and version. Now continuing with build, without attempting to install dependencies."
+    fi
+else
+    echo "Could not detect the Linux distribution and version. Now continuing with build, without attempting to install dependencies."
+fi
+
+
+status=$(git status)
+
+# Check if the status contains the phrase "Your branch is behind"
+if [[ $status == *"Your branch is behind"* ]]; then
+    echo "Your branch is behind the remote repository."
+    echo "Pulling the latest changes..."
+    git pull origin $(git rev-parse --abbrev-ref HEAD)
+elif [[ $status == *"Your branch is up to date"* ]]; then
+    echo "Your branch is up to date with the remote repository."
+else
+    echo "Failed to determine the repository status."
+fi
+
+
+
+# Assuming the script is in the same directory as "napture"
+cd "$(dirname "$0")/napture" || exit 1
+
+# Build Napture
+cargo build --release || exit 1
+
+echo "Installing Napture..."
+
+# Copy files
+sudo install -Dm755 ./target/release/webx /usr/bin/napture
+sudo install -Dm644 ./io.github.face_hh.Napture.metainfo.xml -t /usr/share/metainfo/
+sudo install -Dm644 ./io.github.face_hh.Napture.desktop -t /usr/share/applications/
+sudo install -Dm644 ./io.github.face_hh.Napture.svg -t /usr/share/icons/hicolor/scalable/apps/
+
+# Update desktop database
+sudo update-desktop-database
+
+echo "Napture installation completed."

install-macos.sh

@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+echo "Building Napture..."
+
+status=$(git status)
+
+# Check if the status contains the phrase "Your branch is behind"
+if [[ $status == *"Your branch is behind"* ]]; then
+    echo "Your branch is behind the remote repository."
+    echo "Pulling the latest changes..."
+    git pull origin $(git rev-parse --abbrev-ref HEAD)
+elif [[ $status == *"Your branch is up to date"* ]]; then
+    echo "Your branch is up to date with the remote repository."
+else
+    echo "Failed to determine the repository status."
+fi
+
+# Install deps using Homebrew
+brew install gtk4 graphene glib libadwaita lua pkg-config || exit 1
+
+# Assuming the script is in the same directory as "napture"
+cd "$(dirname "$0")/napture" || exit 1
+
+# Specifies required environment variable HOMEBREW_CELLAR when it is not set
+arch_name=$(uname -m)
+if [ "$arch_name" = "x86_64" ]; then
+  # Intel Mac
+  export HOMEBREW_CELLAR="/usr/local/Cellar"
+elif [ "$arch_name" = "arm64" ]; then
+  # Apple Silicon Mac
+  export HOMEBREW_CELLAR="/opt/homebrew/Cellar"
+else
+  echo "Unsupported architecture: $arch_name"
+  exit 1
+fi
+
+# Build the project
+RUSTFLAGS="-L $HOMEBREW_CELLAR" cargo build --release || exit 1
+
+# Make an app bundle
+mkdir -p target/release/Napture.app/Contents/MacOS
+cp target/release/webx target/release/Napture.app/Contents/MacOS
+cp ./Info.plist target/release/Napture.app/Contents
+
+# Thanks https://stackoverflow.com/a/31883126/9376340
+
+mkdir -p target/release/Napture.app/Contents/Resources/AppIcon.iconset
+
+# Normal screen icons
+for SIZE in 16 32 64 128 256 512; do
+    sips -z $SIZE $SIZE ./file.png --out target/release/Napture.app/Contents/Resources/AppIcon.iconset/icon_${SIZE}x${SIZE}.png || exit 1
+done
+
+# Retina display icons
+for SIZE in 32 64 256 512; do
+    sips -z $SIZE $SIZE ./file.png --out target/release/Napture.app/Contents/Resources/AppIcon.iconset/icon_$(expr $SIZE / 2)x$(expr $SIZE / 2)x2.png || exit 1
+done
+
+# Make a multi-resolution Icon
+iconutil -c icns -o target/release/Napture.app/Contents/Resources/AppIcon.icns target/release/Napture.app/Contents/Resources/AppIcon.iconset || exit 1
+rm -rf target/release/Napture.app/Contents/Resources/AppIcon.iconset
+
+# Sign the app bundle
+codesign --force --deep --sign - target/release/Napture.app || exit 1
+
+# Move to Application folder
+
+echo "Installing Napture..."
+
+mv target/release/Napture.app /Applications || exit 1
+
+echo "Napture installation completed."

install-windows.ps1

@@ -0,0 +1,197 @@
+# Clear the screen
+Clear-Host
+
+# Set the title to WebX Windows Installation
+$host.ui.RawUI.WindowTitle = "WebX Windows Compilation"
+
+# Create our helper function for error handling
+function Write-Error([string]$message, [bool]$exit = $false, [bool]$newLineMsg = $true)
+{
+    # Write the [!] in dark red, and the message in red
+    Write-Host "[!] " -ForegroundColor DarkRed -NoNewline
+    if ($newLineMsg) { Write-Host $message -ForegroundColor Red }
+    else { Write-Host $message -ForegroundColor Red -NoNewline }
+
+    # Exit the script if specified
+    if ($exit) { exit }
+}
+
+# Setup constant variables for Rust installer URLs
+$RUSTUP_32bit = "https://win.rustup.rs/i686"
+$RUSTUP_64bit = "https://win.rustup.rs/x86_64"
+
+# Check if we are running as an administrator, if not, relaunch as an administrator
+$wid=[System.Security.Principal.WindowsIdentity]::GetCurrent()
+$prp=new-object System.Security.Principal.WindowsPrincipal($wid)
+
+if (-not $prp.IsInRole([System.Security.Principal.WindowsBuiltInRole]::Administrator))
+{
+    Write-Error "You must run this script as an administrator. Relaunch as an administrator? [Y/N]: " $false $false
+    $choice = Read-Host
+
+    if ($choice -eq "Y" -or $choice -eq "y")
+    {
+        try {
+            Start-Process powershell.exe "-NoProfile -ExecutionPolicy Bypass -File `"$PSCommandPath`"" -Verb RunAs
+        }
+        catch {
+            Write-Error "Failed to relaunch as administrator. Aborting!" $true
+        }
+        exit
+    }
+    else
+    {
+        Write-Error "User chose not to relaunch as an administrator. Admin rights are required to compile WebX. Aborting!" $true
+    }
+}
+
+# Ask the user if they want to continue
+Write-Host "This script will install the necessary tools to compile WebX on Windows. This includes Rust, Cargo, and the necessary dependencies." -ForegroundColor Green
+Write-Host "Do you want to continue? [Y/N]: " -NoNewline
+$choice = Read-Host
+
+if ($choice -ne "Y" -and $choice -ne "y")
+{
+    Write-Error "User chose not to continue. Aborting!" $true
+}
+
+Write-Host "DO NOT CLOSE ANY WINDOWS THAT OPEN DURING THE INSTALLATION PROCESS! DOING SO WILL CAUSE THE INSTALLATION TO FAIL!" -ForegroundColor Red
+Write-Host "Continuing in 5 seconds..." -ForegroundColor Yellow
+
+Start-Sleep -Seconds 5
+Write-Host "Starting installation..." -ForegroundColor Green
+
+# Check if Rust is already installed
+if (Test-Path "$env:USERPROFILE\.cargo\bin\rustup.exe")
+{
+    Write-Host "Rust is already installed. Checking for updates..." -ForegroundColor Green
+    try {
+        Start-Process -FilePath "$env:USERPROFILE\.cargo\bin\rustup.exe" -ArgumentList "update" -Wait
+    }
+    catch {
+        Write-Error "Failed to update Rust: $($_.Exception.Message). Aborting!" $true
+
+        # Keep the window open so the user can read the error message and wait for input to close
+        Write-Host "Press any key to close this window..." -ForegroundColor Yellow
+        $null = $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
+        exit
+    }
+}
+else
+{
+    Write-Host "Rust is not installed. Downloading and installing Rust..." -ForegroundColor Green
+    try {
+        # Download the Rust installer
+        $rustup = "$env:TEMP\rustup-init.exe"
+        if ([System.Environment]::Is64BitOperatingSystem)
+        {
+            Invoke-WebRequest -Uri $RUSTUP_64bit -OutFile $rustup
+        }
+        else
+        {
+            Invoke-WebRequest -Uri $RUSTUP_32bit -OutFile $rustup
+        }
+
+        # Run the Rust installer
+        Start-Process -FilePath $rustup -ArgumentList "-y" -Wait
+        Remove-Item $rustup
+    }
+    catch {
+        Write-Error "Failed to download or install Rust: $($_.Exception.Message). Aborting!" $true
+
+        # Keep the window open so the user can read the error message and wait for input to close
+        Write-Host "Press any key to close this window..." -ForegroundColor Yellow
+        $null = $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
+        exit
+    }
+}
+
+# Install Rust components
+Write-Host "Installing Rust components..." -ForegroundColor Green
+try {
+    Start-Process -FilePath "$env:USERPROFILE\.cargo\bin\rustup.exe" -ArgumentList "toolchain install stable-gnu" -Wait
+    Start-Process -FilePath "$env:USERPROFILE\.cargo\bin\rustup.exe" -ArgumentList "default stable-gnu" -Wait
+}
+catch {
+    Write-Error "Failed to install Rust components: $($_.Exception.Message). Aborting!" $true
+
+    # Keep the window open so the user can read the error message and wait for input to close
+    Write-Host "Press any key to close this window..." -ForegroundColor Yellow
+    $null = $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
+    exit
+}
+
+Write-Host "Preparing to install MSYS2..." -ForegroundColor Green
+
+# Check if MSYS2 is already installed. Default location is C:\msys32 or C:\msys64 if running 64-bit
+$msysname = if ([System.Environment]::Is64BitOperatingSystem) { "msys64" } else { "msys32" }
+
+if (Test-Path "C:\$msysname\msys2.exe")
+{
+    Write-Host "msys2 is already installed. Skipping..." -ForegroundColor Green
+}
+else
+{
+    Write-Host "Downloading and installing msys2..." -ForegroundColor Green
+    try {
+        # Download the MSYS2 installer
+        $msys2 = "$env:TEMP\msys2.exe"
+        $msys2arch = if ([System.Environment]::Is64BitOperatingSystem) { "x86_64" } else { "i686" }
+
+        Write-Host "Downloading MSYS2 installer from URI: https://repo.msys2.org/distrib/msys2-$msys2arch-latest.exe" -ForegroundColor Yellow
+        Invoke-WebRequest -Uri "https://repo.msys2.org/distrib/msys2-$msys2arch-latest.exe" -OutFile $msys2
+
+        Write-Host "IMPORTANT: PLEASE READ THE FOLLOWING INSTRUCTIONS CAREFULLY!" -ForegroundColor Yellow
+        Write-Host "1. When the MSYS2 installer opens, press Enter to install MSYS2 to the default location (C:\$msysname)." -ForegroundColor Yellow
+        Write-Host "2. After installation, close the MSYS2 installer and return to this script." -ForegroundColor Yellow
+        Write-Host "3. Untick the 'Run MSYS2 now' checkbox and click Finish." -ForegroundColor Yellow
+        Write-Host "Press any key to continue..." -ForegroundColor Yellow
+
+        # Wait for user to read instructions
+        $null = $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
+
+        # Run the MSYS2 installer
+        Start-Process -FilePath $msys2 -ArgumentList "-y" -Wait
+        Remove-Item $msys2
+    }
+    catch {
+        Write-Error "Failed to download or install MSYS2: $($_.Exception.Message). Aborting!" $false
+
+        # Keep the window open so the user can read the error message and wait for input to close
+        Write-Host "Press any key to close this window..." -ForegroundColor Yellow
+        $null = $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
+        exit
+    }
+}
+
+# Print warning not to close any MSYS2 windows
+Write-Host "DO NOT CLOSE ANY MSYS2 WINDOWS THAT OPEN DURING THE FOLLOWING STEPS! DOING SO WILL CAUSE THE INSTALLATION TO FAIL!" -ForegroundColor Red
+
+# Sync MSYS2 packages
+Write-Host "Running MSYS2 package sync and package installation..." -ForegroundColor Green
+try {
+    Start-Process "C:\$msysname\msys2_shell.cmd" -ArgumentList "-defterm -here -no-start -mingw32 -c `"pacman -Syu --noconfirm && pacman -S --noconfirm mingw-w64-x86_64-toolchain base-devel mingw-w64-x86_64-gtk4 mingw-w64-x86_64-gettext mingw-w64-x86_64-libxml2 mingw-w64-x86_64-librsvg mingw-w64-x86_64-pkgconf mingw-w64-x86_64-gcc mingw-w64-x86_64-libadwaita mingw-w64-x86_64-lua && exit`"" -Wait
+
+}
+catch {
+    Write-Error "Failed to sync MSYS2 packages. Aborting!" $true
+}
+
+# Add MSYS2 directories to the PATH
+Write-Host "Adding MSYS2 directories to the PATH..." -ForegroundColor Green
+try {
+    $msyspath = "C:\$msysname\mingw64\bin;C:\$msysname\mingw64\lib;C:\$msysname\mingw64\include"
+    $oldpath = [System.Environment]::GetEnvironmentVariable("PATH", [System.EnvironmentVariableTarget]::Machine)
+    $newpath = "$msyspath;$oldpath"
+    [System.Environment]::SetEnvironmentVariable("PATH", $newpath, [System.EnvironmentVariableTarget]::Machine)
+}
+catch {
+    Write-Error "Failed to add MSYS2 directories to the PATH. Aborting!" $true
+}
+
+Write-Host "Installation complete! You should now be able to cargo run (or cargo build) WebX." -ForegroundColor Green
+Write-Host "Press any key to close this window..." -ForegroundColor Yellow
+
+# Wait for user to read message
+$null = $host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown")
+exit