Merge 2cafa5848e into a374ac8fac

fix: add unzip to dependencies for Mainsail and Fluidd
allow non-github klipper repositories, as well as ssh cloning for github+gitlab
2026-11-08 13:14:39 +05:00 · 2024-05-11 11:27:01 -05:00 · 2024-05-09 20:56:16 +02:00 · 2024-03-18 21:58:12 -05:00
3 changed files with 8 additions and 4 deletions
@@ -37,7 +37,7 @@ function install_fluidd() {
  fi

  ### checking dependencies
-  local dep=(wget nginx)
+  local dep=(wget nginx unzip)
  dependency_check "${dep[@]}"
  ### detect conflicting Haproxy and Apache2 installations
  detect_conflicting_packages
@@ -253,8 +253,12 @@ function clone_klipper() {
  local repo=${1} branch=${2}

  [[ -z ${repo} ]] && repo="${KLIPPER_REPO}"
-  repo=$(echo "${repo}" | sed -r "s/^(http|https):\/\/github\.com\///i; s/\.git$//")
-  repo="https://github.com/${repo}"
+  if [[ "${repo}" =~ ^(http|https):\/\/github.com || ! "$repo" =~ ^(http|https):\/\/ && ! "$repo" =~ ^git@ ]]; then
+    repo=$(echo "${repo}" | sed -r "s/^(http|https):\/\/github\.com\///i; s/\.git$//")
+    repo="https://github.com/${repo}"
+  else
+    repo=${repo}
+  fi

  [[ -z ${branch} ]] && branch="master"

@@ -37,7 +37,7 @@ function install_mainsail() {
  fi

  ### checking dependencies
-  local dep=(wget nginx)
+  local dep=(wget nginx unzip)
  dependency_check "${dep[@]}"
  ### detect conflicting Haproxy and Apache2 installations
  detect_conflicting_packages
Author	SHA1	Message	Date
o080o	5d4c124b99	Merge `2cafa5848e` into `a374ac8fac`	2024-05-11 11:27:01 -05:00
Justin Otherguy	a374ac8fac	fix: add unzip to dependencies for Mainsail and Fluidd	2024-05-09 20:56:16 +02:00
o080o	2cafa5848e	allow non-github klipper repositories, as well as ssh cloning for github+gitlab	2024-03-18 21:58:12 -05:00