output issue

bin/ssh-proxy

@@ -0,0 +1,141 @@
+#!/bin/bash
+
+function showHelp() {
+	echo "ssh-proxy [args] command proxy"
+	echo ""
+	echo "args :"
+	echo "  --help    Show help"
+	echo "command;"
+	echo "  start profile|port target"
+	echo "  stop port"
+	echo "proxy:"
+	echo "  profile   Name of the profile (~/.config/ssh-proxy/*)"
+	echo "  port      Proxy local port (1024-65535)"
+	echo "  target    Proxy target [user@]server[:port]"
+}
+
+if [ "${1}" == "" ]; then
+	showHelp
+	exit 1
+fi
+case ${1} in
+	"--help")
+		showHelp
+		exit 0
+	;;
+	"start" | "stop");;
+	*)
+		showHelp
+		exit 1
+	;;
+esac
+if [ "${2}" == "" ]; then
+	showHelp
+	exit 1
+fi
+
+function startProxy() {
+	LOCAL_PORT=0
+	PROXY=""
+
+	if [ "${2}" == "" ]; then
+		#echo "Use Profile - ${1}"
+		#PROFILE_NAME=${1}
+		PROFILE_FILE=~/.config/ssh-proxy/${1}
+		if [ ! -f "${PROFILE_FILE}" ]; then
+			echo "Error: Profile doesn't exist"
+			exit 1
+		fi
+		LOCAL_PORT=$(grep 'PORT=' "${PROFILE_FILE}" | sed 's/PORT=//')
+		PROXY=$(grep 'PROXY=' "${PROFILE_FILE}" | sed 's/PROXY=//')
+	else
+		# echo "Use args - ${1} ${2}"
+		LOCAL_PORT="${1}"
+		PROXY="${2}"
+	fi
+
+	if [[ ! ${LOCAL_PORT} =~ ^[0-9]+$ ]] || [[ ! ${LOCAL_PORT} -lt 65536 ]]; then
+		echo "Port is not valid (1024-65535)"
+		exit 1
+	fi
+
+	PROXY_USER=""
+	#PROXY_PASSWORD=""
+	PROXY_SERVER=""
+	PROXY_SERVER_PORT="22"
+	PROXY_ADDRESS=""
+
+	if [[ "${PROXY}" == *@* ]]; then
+		PROXY_USER="${PROXY%@*}"
+		PROXY_SERVER="${PROXY#*@*}"
+	else
+		PROXY_SERVER="${PROXY}"
+	fi
+
+	#if [[ "${PROXY_USER}" == *:* ]]; then
+	#  PROXY_PASSWORD="${PROXY_USER#*:*}"
+	#  PROXY_USER="${PROXY_USER%:*}"
+	#fi
+
+	if [[ "${PROXY_SERVER}" == *:* ]]; then
+		PROXY_SERVER_PORT="${PROXY_SERVER#*:*}"
+		PROXY_SERVER="${PROXY_SERVER%:*}"
+	fi
+
+	TMP_FILE=/tmp/ssh-proxy-${USER}/${LOCAL_PORT}
+
+	if [ ! -d /tmp/ssh-proxy-"${USER}" ]; then
+		mkdir /tmp/ssh-proxy-"${USER}"
+	fi
+
+	if [ -f "${TMP_FILE}" ]; then
+		echo "Error: tmpFile exist"
+		exit 1
+	fi
+
+	PROXY_ADDRESS="${PROXY_SERVER}"
+	if [ ! "${PROXY_USER}" == "" ]; then
+		PROXY_ADDRESS="${PROXY_USER}@${PROXY_SERVER}"
+	fi
+
+	echo "Start proxy ${LOCAL_PORT}"
+	if ! ssh -fND 127.0.0.1:"${LOCAL_PORT}" "${PROXY_ADDRESS}" -p "${PROXY_SERVER_PORT}"; then
+		echo "Error: Proxy start error"
+		exit 1
+	fi
+
+	PID=$(lsof -i -P | grep ":${LOCAL_PORT} (LISTEN)" | awk -F ' ' '{print $2}')
+	if [ "${PID}" == "" ]; then
+		echo "Error: No PID found"
+		exit 1
+	fi
+	{
+		#if [ ! "${PROFILE_NAME}" == "" ]; then
+		#	echo "PROFILE_NAME=${PROFILE_NAME}"
+		#fi
+		#echo "LOCAL_PORT=${LOCAL_PORT}"
+		#echo "PROXY_USER=${PROXY_USER}"
+		#echo "PROXY_SERVER=${PROXY_SERVER}"
+		#echo "PROXY_SERVER_PORT=${PROXY_SERVER_PORT}"
+		echo "PID=${PID}"
+	} > "${TMP_FILE}"
+}
+
+function stopProxy() {
+	LOCAL_PORT=${1}
+	TMP_FILE=/tmp/ssh-proxy-${USER}/${LOCAL_PORT}
+	if [ ! -f "${TMP_FILE}" ]; then
+		echo "Error: tmpFile doesn't exist"
+		exit 1
+	fi
+	echo "Stop proxy ${LOCAL_PORT}"
+	PID=$(grep 'PID=' "${TMP_FILE}" | sed 's/PID=//')
+	kill "${PID}"
+	rm "${TMP_FILE}"
+}
+
+case ${1} in
+	"start") startProxy "${2}" "${3}";;
+	"stop") stopProxy "${2}";;
+	*) exit 1;;
+esac

completion/bash/ssh-proxy

@@ -0,0 +1,51 @@
+#!/bin/bash
+
+_ssh-proxy() {
+	# shellcheck disable=SC2034
+	local cur prev words cword args
+	_init_completion || return
+	
+	local -r cmdargs="start stop"
+	local -r cnfargs="--help"
+	local profiledir=~/.config/ssh-proxy
+	local tempdir="/tmp/ssh-proxy-${USER}"
+	
+	if [[ ${COMP_WORDS[*]} == *"--help"* ]]; then
+		return
+	fi
+
+	args=${cmdargs}
+	for arg in ${cnfargs}; do
+		if [[ ${COMP_WORDS[*]} != *"${arg}"* ]]; then
+			args+=" ${arg}"
+		fi
+	done
+	for arg in ${cmdargs}; do
+		if [[ ${COMP_WORDS[*]} == *" ${arg} "* ]]; then
+			args=""
+		fi
+	done
+	
+	case $prev in
+		--help)
+			return
+		;;
+		start)
+			local -r PROFILELIST=$(\ls ${profiledir})
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "${PROFILELIST}" -- "${COMP_WORDS[COMP_CWORD]}"))
+			return
+		;;
+		stop)
+			local -r PROFILELIST=$(\ls ${tempdir})
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "${PROFILELIST}" -- "${COMP_WORDS[COMP_CWORD]}"))
+			return
+		;;
+		*)
+			# shellcheck disable=SC2207
+			COMPREPLY=($(compgen -W "${args}" -- "${COMP_WORDS[COMP_CWORD]}"))
+			return
+		;;
+	esac
+} && complete -F _ssh-proxy ssh-proxy

makerelease.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+declare -r VERSION=${1}
+declare -r MESSAGE=${2}
+declare -r TAGBRANCH=main
+declare CURRENTBRANCH=""
+
+showHelp() {
+	echo makerelease version
+}
+
+if [ "${VERSION}" == "" ]; then
+	showHelp
+	echo ""
+	echo "no version provided!"
+	exit 1
+fi
+
+CURRENTBRANCH=$(git rev-parse --abbrev-ref HEAD)
+
+if [ ! "${CURRENTBRANCH}" == "dev" ]; then
+	echo "You are not in dev branch!"
+	echo "Use dev branch to make a release!"
+	exit 1
+fi
+
+git checkout "${TAGBRANCH}"
+git merge "${CURRENTBRANCH}"
+git push
+git tag -a "${VERSION}" -m "${MESSAGE}"
+git push --tags
+git checkout "${CURRENTBRANCH}"

profile.template

@@ -0,0 +1,2 @@
+PORT=5001
+PROXY=[user@]server[:port]