diff --git a/hack/hive-dev-install.sh b/hack/hive-dev-install.sh
deleted file mode 100755
index 7d3a167f154..00000000000
--- a/hack/hive-dev-install.sh
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/bash
-
-HIVE_OPERATOR_NS="hive"
-KUBECTL=$( which kubectl 2> /dev/null || which oc 2> /dev/null)
-
-function cleanup {
-	[ -f "$(pwd)/kubectl" ] && rm -f "$(pwd)/kubectl"
-}
-
-function download_tmp_kubectl {
-	curl -sLO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
-	if [ $? -ne 0 ]; then
-		echo ": error downloading kubectl"
-		exit 1
-	fi
-	chmod 755 kubectl
-	KUBECTL="$(pwd)/kubectl"
-}
-
-function verify_tools {
-	if [ ! -z "$KUBECTL" ]; then
-		return
-	fi
-	echo -n "kubectl or oc not detected, downloading"
-	download_tmp_kubectl
-	echo ", done."
-
-	if [ $( $KUBECTL get nodes 2>/dev/null | wc -l ) -eq 0 ]; then
-		echo "unable to connect to the cluster"
-		exit 1
-	fi
-}
-
-set -e
-trap cleanup EXIT
-
-if [ ! -f go.mod ] || [ ! -d ".git" ]; then
-	echo "this script must by run from the repo's root directory"
-	exit 1
-fi
-
-if [ ! -f "./hack/hive-config/hive-deployment.yaml" ] || [ ! -d "./hack/hive-config/crds" ] ; then
-	echo "hive config is missing, generating config, please rerun this script afterwards"
-	./hack/hive-generate-config.sh
-	if [ $? -ne 0 ]; then
-		echo "error generating the hive configs"
-		exit 1
-	fi
-fi
-
-if [ -z "$PULL_SECRET" ]; then
-	echo "global pull secret variable required, please source ./env"
-	exit
-fi
-
-verify_tools
-
-if [ $( $KUBECTL get namespace $HIVE_OPERATOR_NS -o yaml 2>/dev/null | wc -l ) -ne 0 ]; then
-	echo "hive is already installed in the namespace"
-	echo -n "would you like to reapply the configs? (y/N): "
-	read answer
-	if [[ "$answer" != "y" ]]; then
-		exit
-	fi
-else
-	$KUBECTL create namespace $HIVE_OPERATOR_NS
-fi
-
-$KUBECTL apply -f ./hack/hive-config/crds
-
-echo "$PULL_SECRET" > /tmp/.tmp-secret
-# Using dry-run allows updates to work seamlessly
-$KUBECTL create secret generic hive-global-pull-secret --from-file=.dockerconfigjson=/tmp/.tmp-secret --type=kubernetes.io/dockerconfigjson --namespace $HIVE_OPERATOR_NS -o yaml --dry-run=client | $KUBECTL apply -f - 2>/dev/null
-rm -f /tmp/.tmp-secret
-
-sed "s/HIVE_OPERATOR_NS/$HIVE_OPERATOR_NS/g" hack/hive-config/hive-config.yaml | $KUBECTL apply -f -
-$KUBECTL apply -f ./hack/hive-config/hive-additional-install-log-regexes.yaml
-
-$KUBECTL apply -f ./hack/hive-config/hive-deployment.yaml
-
-$KUBECTL wait --timeout=5m --for=condition=Available --namespace $HIVE_OPERATOR_NS deployment/hive-operator
-$KUBECTL wait --timeout=5m --for=condition=Available --namespace $HIVE_OPERATOR_NS deployment/hive-controllers
-$KUBECTL wait --timeout=5m --for=condition=Ready --namespace $HIVE_OPERATOR_NS pod --selector "control-plane=clustersync"
-
-echo -e "\nHive is installed."
diff --git a/hack/hive/hive-dev-install.sh b/hack/hive/hive-dev-install.sh
new file mode 100755
index 00000000000..562e0d42571
--- /dev/null
+++ b/hack/hive/hive-dev-install.sh
@@ -0,0 +1,89 @@
+#!/bin/bash
+
+set -o errexit \
+    -o nounset
+
+HIVE_OPERATOR_NS="hive"
+KUBECTL=$( which kubectl 2> /dev/null || which oc 2> /dev/null)
+
+main() {
+	log "enter hive installation"
+	local skip_deployments=${1:-"none"}
+	trap cleanup EXIT
+
+	if [ ! -f "./hack/hive/hive-config/hive-deployment.yaml" ] || [ ! -d "./hack/hive/hive-config/crds" ] ; then
+		log "hive config is missing, generating config, please rerun this script afterwards"
+		./hack/hive/hive-generate-config.sh
+		if [ $? -ne 0 ]; then
+			abort "error generating the hive configs"
+		fi
+	fi
+
+	if [ -z "$PULL_SECRET" ]; then
+		log "global pull secret variable required, please source ./env"
+		exit
+	fi
+	verify_tools
+
+	if [ $( $KUBECTL get namespace $HIVE_OPERATOR_NS -o yaml 2>/dev/null | wc -l ) -ne 0 ]; then
+		log "hive is already installed in namespace $HIVE_OPERATOR_NS"
+		log -n "would you like to reapply the configs? (y/N): "
+		read answer
+		if [[ "$answer" != "y" ]]; then
+			exit
+		fi
+	else
+		$KUBECTL create namespace $HIVE_OPERATOR_NS
+	fi
+
+	log "Hive is ready to be installed"
+	$KUBECTL apply -f ./hack/hive/hive-config/crds
+	echo "$PULL_SECRET" > /tmp/.tmp-secret
+	# Using dry-run allows updates to work seamlessly
+	$KUBECTL create secret generic hive-global-pull-secret --from-file=.dockerconfigjson=/tmp/.tmp-secret --type=kubernetes.io/dockerconfigjson --namespace $HIVE_OPERATOR_NS -o yaml --dry-run=client | $KUBECTL apply -f - 2>/dev/null
+	rm -f /tmp/.tmp-secret
+
+	sed "s/HIVE_OPERATOR_NS/$HIVE_OPERATOR_NS/g" hack/hive/hive-config/hive-config.yaml | $KUBECTL apply -f -
+	$KUBECTL apply -f ./hack/hive/hive-config/hive-additional-install-log-regexes.yaml
+	$KUBECTL apply -f ./hack/hive/hive-config/hive-deployment.yaml
+	$KUBECTL wait --timeout=5m --for=condition=Available --namespace $HIVE_OPERATOR_NS deployment/hive-operator
+	log "\nHive is installed."
+}
+
+function download_tmp_kubectl {
+	curl -sLO "https://dl.k8s.io/release/$(curl -L -s https://dl.k8s.io/release/stable.txt)/bin/linux/amd64/kubectl"
+	if [ $? -ne 0 ]; then
+		abort ": error downloading kubectl"
+	fi
+	chmod 755 kubectl
+	KUBECTL="$(pwd)/kubectl"
+}
+
+function verify_tools {
+	if [ ! -z "$KUBECTL" ]; then
+		return
+	fi
+	log "kubectl or oc not detected, downloading"
+	download_tmp_kubectl
+	log "done: downloading kubectl/oc was completed"
+
+	if [ $( $KUBECTL get nodes 2>/dev/null | wc -l ) -eq 0 ]; then
+		abort "unable to connect to the cluster"
+	fi
+}
+
+if [ ! -f go.mod ] || [ ! -d ".git" ]; then
+	echo "this script must by run from the repo's root directory"
+	exit 1
+fi
+
+declare -r utils=hack/util.sh
+if [ -f "$utils" ]; then
+    source "$utils"
+fi
+
+function cleanup {
+	[ -f "$(pwd)/kubectl" ] && rm -f "$(pwd)/kubectl"
+}
+
+main "$@"