zrb 0.6.1__py3-none-any.whl → 0.7.0__py3-none-any.whl

zrb/builtin/devtool/aws/install.sh

@@ -1,13 +1,3 @@
-set -e
-
-# Determine OS type
-OS_TYPE=$(uname)
-
-# Function to check if a command exists
-command_exists() {
-    command -v "$1" &> /dev/null
-}
-
 if [ ! -f "./awscliv2.zip" ]
 then
     echo "Download AWS CLI"
@@ -32,24 +22,28 @@ else
         fi
     elif [ "$OS_TYPE" = "Linux" ]
     then
-        if command_exists apt
+        if command_exists pkg
+        then
+            try_sudo pkg update
+            try_sudo pkg install -y unzip
+        elif command_exists apt
         then
-            sudo add-apt-repository ppa:maveonair/unzip-editor -y
-            sudo apt update
-            sudo apt install -y unzip
+            try_sudo add-apt-repository ppa:maveonair/unzip-editor -y
+            try_sudo apt update
+            try_sudo apt install -y unzip
         elif command_exists yum
         then
-            sudo yum install -y unzip
+            try_sudo yum install -y unzip
         elif command_exists dnf
         then
-            sudo dnf copr enable varlad/unzip
-            sudo dnf install -y unzip
+            try_sudo dnf copr enable varlad/unzip
+            try_sudo dnf install -y unzip
         elif command_exists pacman
         then
-            sudo pacman -Syu --noconfirm unzip
+            try_sudo pacman -Syu --noconfirm unzip
         elif command_exists snap
         then
-            sudo snap install unzip
+            try_sudo snap install unzip
         else
             echo "No known package manager found. Please install unzip manually."
             exit 1

zrb/builtin/devtool/devtool_install.py

@@ -12,7 +12,8 @@ from zrb.task.task import Task
 from zrb.task_input.bool_input import BoolInput
 from zrb.task_input.str_input import StrInput
 
-dir_path = os.path.dirname(__file__)
+CURRENT_DIR = os.path.dirname(__file__)
+SHELL_SCRIPT_DIR = os.path.join(CURRENT_DIR, "..", "..", "shell-scripts")
 current_shell = get_current_shell()
 
 ###############################################################################
@@ -76,19 +77,25 @@ install_gvm = FlowTask(
     steps=[
         CmdTask(
             name="download-gvm",
-            cmd_path=os.path.join(dir_path, "gvm", "download.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "gvm", "download.sh"),
+            ],
             preexec_fn=None,
         ),
         Task(
             name="configure-gvm",
             run=write_config(
-                template_file=os.path.join(dir_path, "gvm", "resource", "config.sh"),
+                template_file=os.path.join(CURRENT_DIR, "gvm", "resource", "config.sh"),
                 config_file="{{input.config_file}}",
             ),
         ),
         CmdTask(
             name="finalize-gvm-installation",
-            cmd_path=os.path.join(dir_path, "gvm", "finalize.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "gvm", "finalize.sh"),
+            ],
             preexec_fn=None,
         ),
     ],
@@ -111,19 +118,27 @@ install_pyenv = FlowTask(
     steps=[
         CmdTask(
             name="download-pyenv",
-            cmd_path=os.path.join(dir_path, "pyenv", "download.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "pyenv", "download.sh"),
+            ],
             preexec_fn=None,
         ),
         Task(
             name="configure-pyenv",
             run=write_config(
-                template_file=os.path.join(dir_path, "pyenv", "resource", "config.sh"),
+                template_file=os.path.join(
+                    CURRENT_DIR, "pyenv", "resource", "config.sh"
+                ),
                 config_file="{{input.config_file}}",
             ),
         ),
         CmdTask(
             name="finalize-pyenv-installation",
-            cmd_path=os.path.join(dir_path, "pyenv", "finalize.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "pyenv", "finalize.sh"),
+            ],
             preexec_fn=None,
         ),
     ],
@@ -146,19 +161,25 @@ install_nvm = FlowTask(
     steps=[
         CmdTask(
             name="download-nvm",
-            cmd_path=os.path.join(dir_path, "nvm", "download.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "nvm", "download.sh"),
+            ],
             preexec_fn=None,
         ),
         Task(
             name="configure-nvm",
             run=write_config(
-                template_file=os.path.join(dir_path, "nvm", "resource", "config.sh"),
+                template_file=os.path.join(CURRENT_DIR, "nvm", "resource", "config.sh"),
                 config_file="{{input.config_file}}",
             ),
         ),
         CmdTask(
             name="finalize-nvm-installation",
-            cmd_path=os.path.join(dir_path, "nvm", "finalize.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "nvm", "finalize.sh"),
+            ],
             preexec_fn=None,
         ),
     ],
@@ -188,19 +209,27 @@ install_sdkman = FlowTask(
     steps=[
         CmdTask(
             name="download-sdkman",
-            cmd_path=os.path.join(dir_path, "sdkman", "download.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "sdkman", "download.sh"),
+            ],
             preexec_fn=None,
         ),
         Task(
             name="configure-sdkman",
             run=write_config(
-                template_file=os.path.join(dir_path, "sdkman", "resource", "config.sh"),
+                template_file=os.path.join(
+                    CURRENT_DIR, "sdkman", "resource", "config.sh"
+                ),
                 config_file="{{input.config_file}}",
             ),
         ),
         CmdTask(
             name="finalize-sdkman-installation",
-            cmd_path=os.path.join(dir_path, "sdkman", "finalize.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "sdkman", "finalize.sh"),
+            ],
             preexec_fn=None,
         ),
     ],
@@ -216,13 +245,18 @@ install_pulumi = FlowTask(
     steps=[
         CmdTask(
             name="install-pulumi",
-            cmd_path=os.path.join(dir_path, "pulumi", "install.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "pulumi", "install.sh"),
+            ],
             preexec_fn=None,
         ),
         Task(
             name="configure-pulumi",
             run=write_config(
-                template_file=os.path.join(dir_path, "pulumi", "resource", "config.sh"),
+                template_file=os.path.join(
+                    CURRENT_DIR, "pulumi", "resource", "config.sh"
+                ),
                 config_file="{{input.config_file}}",
             ),
         ),
@@ -238,7 +272,10 @@ install_aws = FlowTask(
     steps=[
         CmdTask(
             name="install-aws",
-            cmd_path=os.path.join(dir_path, "aws", "install.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "aws", "install.sh"),
+            ],
             preexec_fn=None,
         ),
     ],
@@ -253,7 +290,10 @@ install_gcloud = FlowTask(
     steps=[
         CmdTask(
             name="install-gcloud",
-            cmd_path=os.path.join(dir_path, "gcloud", "install.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "gcloud", "install.sh"),
+            ],
             preexec_fn=None,
         ),
     ],
@@ -276,13 +316,18 @@ install_tmux = FlowTask(
     steps=[
         CmdTask(
             name="install-tmux",
-            cmd_path=os.path.join(dir_path, "tmux", "install.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "tmux", "install.sh"),
+            ],
             preexec_fn=None,
         ),
         Task(
             name="configure-tmux",
             run=write_config(
-                template_file=os.path.join(dir_path, "tmux", "resource", "config.sh"),
+                template_file=os.path.join(
+                    CURRENT_DIR, "tmux", "resource", "config.sh"
+                ),
                 config_file="{{input.tmux_config_file}}",
             ),
         ),
@@ -306,13 +351,16 @@ install_zsh = FlowTask(
     steps=[
         CmdTask(
             name="install-zsh",
-            cmd_path=os.path.join(dir_path, "zsh", "install.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "zsh", "install.sh"),
+            ],
             preexec_fn=None,
         ),
         Task(
             name="configure-zsh",
             run=write_config(
-                template_file=os.path.join(dir_path, "zsh", "resource", "config.sh"),
+                template_file=os.path.join(CURRENT_DIR, "zsh", "resource", "config.sh"),
                 config_file="{{input.zsh_config_file}}",
             ),
         ),
@@ -328,7 +376,10 @@ install_kubectl = FlowTask(
     steps=[
         CmdTask(
             name="install-kubectl",
-            cmd_path=os.path.join(dir_path, "kubectl", "install.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "kubectl", "install.sh"),
+            ],
             preexec_fn=None,
         ),
     ],
@@ -343,7 +394,10 @@ install_helm = FlowTask(
     steps=[
         CmdTask(
             name="install-helm",
-            cmd_path=os.path.join(dir_path, "helm", "install.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "helm", "install.sh"),
+            ],
             preexec_fn=None,
         ),
     ],
@@ -358,7 +412,10 @@ install_docker = FlowTask(
     steps=[
         CmdTask(
             name="install-docker",
-            cmd_path=os.path.join(dir_path, "docker", "install.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "docker", "install.sh"),
+            ],
             preexec_fn=None,
         ),
     ],
@@ -374,14 +431,17 @@ install_terraform = FlowTask(
     steps=[
         CmdTask(
             name="install-terraform",
-            cmd_path=os.path.join(dir_path, "terraform", "install.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "terraform", "install.sh"),
+            ],
             preexec_fn=None,
         ),
         Task(
             name="configure-terraform",
             run=write_config(
                 template_file=os.path.join(
-                    dir_path, "terraform", "resource", "config.sh"
+                    CURRENT_DIR, "terraform", "resource", "config.sh"
                 ),
                 config_file="{{input.config_file}}",
             ),
@@ -398,7 +458,10 @@ install_helix = FlowTask(
     steps=[
         CmdTask(
             name="install-helix",
-            cmd_path=os.path.join(dir_path, "helix", "install.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "helix", "install.sh"),
+            ],
             preexec_fn=None,
         ),
         [
@@ -406,7 +469,7 @@ install_helix = FlowTask(
                 name="create-helix-theme",
                 run=write_config(
                     template_file=os.path.join(
-                        dir_path,
+                        CURRENT_DIR,
                         "helix",
                         "resource",
                         "themes",
@@ -420,7 +483,7 @@ install_helix = FlowTask(
                 name="configure-helix",
                 run=write_config(
                     template_file=os.path.join(
-                        dir_path, "helix", "resource", "config.toml"
+                        CURRENT_DIR, "helix", "resource", "config.toml"
                     ),
                     config_file="~/.config/helix/config.toml",
                     remove_old_config=True,
@@ -428,7 +491,10 @@ install_helix = FlowTask(
             ),
             CmdTask(
                 name="install-language-server",
-                cmd_path=os.path.join(dir_path, "helix", "install-language-server.sh"),
+                cmd_path=[
+                    os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                    os.path.join(CURRENT_DIR, "helix", "install-language-server.sh"),
+                ],
                 preexec_fn=None,
             ),
         ],
@@ -444,7 +510,10 @@ install_selenium = FlowTask(
     steps=[
         CmdTask(
             name="install-selenium",
-            cmd_path=os.path.join(dir_path, "selenium", "install.sh"),
+            cmd_path=[
+                os.path.join(SHELL_SCRIPT_DIR, "_common-util.sh"),
+                os.path.join(CURRENT_DIR, "selenium", "install.sh"),
+            ],
             preexec_fn=None,
         )
     ],

zrb/builtin/devtool/docker/install.sh

@@ -1,13 +1,3 @@
-set -e
-
-# Determine OS type
-OS_TYPE=$(uname)
-
-# Function to check if a command exists
-command_exists() {
-    command -v "$1" &> /dev/null
-}
-
 # Install Docker
 if command_exists docker
 then
@@ -28,29 +18,29 @@ else
     then
         if command_exists apt
         then
-            sudo apt update
-            sudo apt-get remove docker docker-engine docker.io containerd runc || true
-            sudo apt install -y apt-transport-https ca-certificates curl software-properties-common
-            curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-            sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
-            echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
-            sudo apt update
-            sudo apt install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
+            try_sudo apt update
+            try_sudo apt-get remove docker docker-engine docker.io containerd runc || true
+            try_sudo apt install -y apt-transport-https ca-certificates curl software-properties-common
+            curl -fsSL https://download.docker.com/linux/ubuntu/gpg |try_sudo gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+            try_sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
+            echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" |try_sudo tee /etc/apt/sources.list.d/docker.list > /dev/null
+            try_sudo apt update
+            try_sudo apt install -y docker-ce docker-ce-cli containerd.io docker-compose-plugin
         elif command_exists yum
         then
-            sudo yum install -y docker
-            sudo systemctl start docker
-            sudo systemctl enable docker
+            try_sudo yum install -y docker
+            try_sudo systemctl start docker
+            try_sudo systemctl enable docker
         elif command_exists dnf
         then
-            sudo dnf install -y docker
-            sudo systemctl start docker
-            sudo systemctl enable docker
+            try_sudo dnf install -y docker
+            try_sudo systemctl start docker
+            try_sudo systemctl enable docker
         elif command_exists pacman
         then
-            sudo pacman -Syu --noconfirm docker
-            sudo systemctl start docker
-            sudo systemctl enable docker
+            try_sudo pacman -Syu --noconfirm docker
+            try_sudo systemctl start docker
+            try_sudo systemctl enable docker
         else
             echo "No known package manager found. Please install Docker manually."
             exit 1

zrb/builtin/devtool/gcloud/install.sh

@@ -1,19 +1,9 @@
-set -e
-
-# Determine OS type
-OS_TYPE=$(uname)
-
-# Function to check if a command exists
-command_exists() {
-    command -v "$1" &> /dev/null
-}
-
 if command_exists apt
 then
-    echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
-    sudo apt install -y apt-transport-https ca-certificates gnupg
-    curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
-    sudo apt update && sudo apt install -y google-cloud-sdk
+    echo "deb [signed-by=/usr/share/keyrings/cloud.google.gpg] https://packages.cloud.google.com/apt cloud-sdk main" |try_sudo tee -a /etc/apt/sources.list.d/google-cloud-sdk.list
+    try_sudo apt install -y apt-transport-https ca-certificates gnupg
+    curl https://packages.cloud.google.com/apt/doc/apt-key.gpg |try_sudo apt-key --keyring /usr/share/keyrings/cloud.google.gpg add -
+    try_sudo apt update &&try_sudo apt install -y google-cloud-sdk
 else
     echo "apt not found"
     exit 1

zrb/builtin/devtool/gvm/download.sh

@@ -1,15 +1,12 @@
-set -e
-
-# Function to check if a command exists
-command_exists() {
-    command -v "$1" &> /dev/null
-}
-
 if [ ! -d "${HOME}/.gvm" ]
 then
-    if command_exists apt
+    if command_exists pkg
     then
-        sudo apt install -y bison
+        try_sudo pkg update
+        try_sudo pkg install -y bison ncurses-utils
+    elif command_exists apt
+    then
+        try_sudo apt install -y bison
     fi
     echo "Download GVM"
     curl -o- https://raw.githubusercontent.com/moovweb/gvm/master/binscripts/gvm-installer | bash

zrb/builtin/devtool/helix/install.sh

@@ -1,13 +1,3 @@
-set -e
-
-# Determine OS type
-OS_TYPE=$(uname)
-
-# Function to check if a command exists
-command_exists() {
-    command -v "$1" &> /dev/null
-}
-
 # Install helix
 if command_exists hx
 then
@@ -25,25 +15,28 @@ else
         fi
     elif [ "$OS_TYPE" = "Linux" ]
     then
-        if command_exists apt
+        if command_exists pkg
+        then
+             try_sudo pkg update
+             try_sudo pkg install -y xclip helix
+        elif command_exists apt
         then
-            sudo apt install -y xclip
-            sudo add-apt-repository ppa:maveonair/helix-editor -y
-            sudo apt update
-            sudo apt install -y helix
+             try_sudo add-apt-repository ppa:maveonair/helix-editor -y
+             try_sudo apt update
+             try_sudo apt install -y helix xclip
         elif command_exists yum
         then
-            sudo yum install -y helix
+             try_sudo yum install -y helix
         elif command_exists dnf
         then
-            sudo dnf copr enable varlad/helix
-            sudo dnf install -y helix
+             try_sudo dnf copr enable varlad/helix
+             try_sudo dnf install -y helix
         elif command_exists pacman
         then
-            sudo pacman -Syu --noconfirm helix
+             try_sudo pacman -Syu --noconfirm helix
         elif command_exists snap
         then
-            sudo snap install helix
+             try_sudo snap install helix
         else
             echo "No known package manager found. Please install helix manually."
             exit 1
@@ -52,4 +45,14 @@ else
         echo "Unsupported OS type. Please install helix manually."
         exit 1
     fi
-fi
+fi
+
+if command_exists hx
+then
+    hx --grammar fetch
+    hx --grammar build
+elif command_exists helix
+then
+    helix --grammar fetch
+    helix --grammar build
+fi

zrb/builtin/devtool/pyenv/download.sh

@@ -1,13 +1,3 @@
-set -e
-
-# Determine OS type
-OS_TYPE=$(uname)
-
-# Function to check if a command exists
-command_exists() {
-    command -v "$1" &> /dev/null
-}
-
 if [ ! -d "${HOME}/.pyenv" ]
 then
     if [ "$OS_TYPE" = "Darwin" ]
@@ -20,26 +10,30 @@ then
         fi
     elif [ "$OS_TYPE" = "Linux" ]
     then
-        if command_exists apt
+        if command_exists pkg
         then
-            sudo apt update
-            sudo apt install -y build-essential libssl-dev zlib1g-dev \
+            try_sudo pkg update
+            try_sudo pkg install -y build-essential
+        elif command_exists apt
+        then
+            try_sudo apt update
+            try_sudo apt install -y build-essential libssl-dev zlib1g-dev \
     libbz2-dev libreadline-dev libsqlite3-dev curl \
     libncursesw5-dev xz-utils tk-dev libxml2-dev libxmlsec1-dev libffi-dev liblzma-dev
         elif command_exists yum
         then
-            sudo yum install -y gcc make patch zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel openssl-devel tk-devel libffi-devel xz-devel
+            try_sudo yum install -y gcc make patch zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel openssl-devel tk-devel libffi-devel xz-devel
         elif command_exists dnf
         then
-            sudo dnf install -y make gcc patch zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel openssl-devel tk-devel libffi-devel xz-devel libuuid-devel gdbm-libs libnsl2
+            try_sudo dnf install -y make gcc patch zlib-devel bzip2 bzip2-devel readline-devel sqlite sqlite-devel openssl-devel tk-devel libffi-devel xz-devel libuuid-devel gdbm-libs libnsl2
         elif command_exists pacman
         then
-            sudo pacman -Syu --noconfirm base-devel openssl zlib xz tk
+            try_sudo pacman -Syu --noconfirm base-devel openssl zlib xz tk
         elif command_exists apk
         then
-            sudo apk add --no-cache git bash build-base libffi-dev openssl-dev bzip2-dev zlib-dev xz-dev readline-dev sqlite-dev tk-dev
+            try_sudo apk add --no-cache git bash build-base libffi-dev openssl-dev bzip2-dev zlib-dev xz-dev readline-dev sqlite-dev tk-dev
         else
-            sudo echo "No known package manager found, continuing anyway"
+            try_sudo echo "No known package manager found, continuing anyway"
         fi
     else
         echo "Unknown OS, cannot install pre-requisites, continuing anyway"

zrb/builtin/devtool/selenium/install.sh

@@ -1,17 +1,12 @@
-set -e
-
-OS_TYPE=$(uname)
-
-# Function to check if a command exists
-command_exists() {
-    command -v "$1" &> /dev/null
-}
-
 if [ "$OS_TYPE" = "Linux" ]
 then
-   if command_exists apt
+    if command_exists pkg
+    then
+        try_sudo pkg update
+        try_sudo pkg install -y unzip wget
+    elif command_exists apt
     then
-        sudo apt install -y unzip wget
+        try_sudo apt install -y unzip wget
     else
         echo "apt does not exists"
         exit 1
@@ -20,13 +15,13 @@ then
     if command_exists dpkg
     then
         wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-        sudo dpkg -i google-chrome-stable_current_amd64.deb
+        try_sudo dpkg -i google-chrome-stable_current_amd64.deb
     else
         echo "dpkg does not exists"
         exit 1
     fi
 
-    sudo apt --fix-broken install
+    try_sudo apt --fix-broken install
 else
     echo "Unsupported OS type. Please install zsh manually."
     exit 1