revert(klipper): revert changes to clone_klipper
Signed-off-by: Dominik Willner <th33xitus@gmail.com>
This commit is contained in:
@@ -275,20 +275,6 @@ function clone_klipper() {
|
|||||||
repo=$(echo "${repo}" | sed -r "s/^(http|https):\/\/github\.com\///i; s/\.git$//")
|
repo=$(echo "${repo}" | sed -r "s/^(http|https):\/\/github\.com\///i; s/\.git$//")
|
||||||
repo="https://github.com/${repo}"
|
repo="https://github.com/${repo}"
|
||||||
|
|
||||||
if [[ -d ${KLIPPER_DIR} ]]
|
|
||||||
then
|
|
||||||
status_msg "Klipper already cloned, checking compatibility ..."
|
|
||||||
local current_repo=$(git -C ${KLIPPER_DIR} config --get remote.origin.url)
|
|
||||||
if [[ "${repo}" == "${current_repo}" ]]
|
|
||||||
then
|
|
||||||
git -C ${KLIPPER_DIR} stash
|
|
||||||
git -C ${KLIPPER_DIR} checkout ${branch}
|
|
||||||
git -C ${KLIPPER_DIR} pull --ff-only
|
|
||||||
klipper_clone_result="1"
|
|
||||||
return
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
[[ -z ${branch} ]] && branch="master"
|
[[ -z ${branch} ]] && branch="master"
|
||||||
|
|
||||||
### force remove existing klipper dir and clone into fresh klipper dir
|
### force remove existing klipper dir and clone into fresh klipper dir
|
||||||
@@ -303,8 +289,6 @@ function clone_klipper() {
|
|||||||
print_error "Cloning Klipper from\n ${repo}\n failed!"
|
print_error "Cloning Klipper from\n ${repo}\n failed!"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
klipper_clone_result="0"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function create_klipper_virtualenv() {
|
function create_klipper_virtualenv() {
|
||||||
|
|||||||
Reference in New Issue
Block a user