From 2e8afd73664f790b8cb711bd9d3e3c82ab4e45d8 Mon Sep 17 00:00:00 2001 From: Mamadou Babaei Date: Mon, 29 Jul 2024 15:31:36 +0200 Subject: [PATCH] fix the windows rsync/git bash issue: the source and destination cannot both be remote --- Handbook/GNUmakefile | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/Handbook/GNUmakefile b/Handbook/GNUmakefile index 2abe480f..216d1df5 100644 --- a/Handbook/GNUmakefile +++ b/Handbook/GNUmakefile @@ -41,16 +41,19 @@ SG_PLUGIN_DIR := $(realpath $(SG_HANDBOOK_DIR)/..) SG_PLUGIN_RESOURCES_DIR := $(SG_PLUGIN_DIR)/Resources SG_PLUGIN_FILE := $(SG_PLUGIN_DIR)/SenseGlove.uplugin -SG_DOCUMENTATION_URL := https://unreal.docs.senseglove.com -SG_DOCUMENTATION_DIR := $(SG_PLUGIN_DIR)/Documentation -SG_DOCUMENTATION_EPUB_DIR := $(SG_DOCUMENTATION_DIR)/epub -SG_DOCUMENTATION_HTML_DIR := $(SG_DOCUMENTATION_DIR)/html -SG_DOCUMENTATION_PDF_DIR := $(SG_DOCUMENTATION_DIR)/pdf-outline -SG_DOCUMENTATION_PDF_FILE := $(SG_DOCUMENTATION_PDF_DIR)/output.pdf +SG_DOCUMENTATION_URL := https://unreal.docs.senseglove.com +SG_DOCUMENTATION_DIR := $(SG_PLUGIN_DIR)/Documentation +SG_DOCUMENTATION_EPUB_DIR := $(SG_DOCUMENTATION_DIR)/epub +SG_DOCUMENTATION_HTML_DIR_NAME := html +SG_DOCUMENTATION_HTML_DIR := $(SG_DOCUMENTATION_DIR)/$(SG_DOCUMENTATION_HTML_DIR_NAME) +SG_DOCUMENTATION_PDF_DIR := $(SG_DOCUMENTATION_DIR)/pdf-outline +SG_DOCUMENTATION_PDF_FILE := $(SG_DOCUMENTATION_PDF_DIR)/output.pdf SG_BROWSER_BINARY_PATH_LINUX := $(shell which brave-bin 2>/dev/null) SG_BROWSER_BINARY_PATH_WINDOWS := C:\Program Files\BraveSoftware\Brave-Browser\Application\brave.exe +SG_RSYNC_BINARY_PATH_WINDOWS := /c/Program\ Files/cwrsync/bin/rsync.exe + ################################################################################ # Platform Detection ################################################################################ @@ -447,8 +450,12 @@ _deploy: @echo "Loading the Handbook deployment configuration file..." @$(call load_env, $(SG_HANDBOOK_DEPLOY_CONFIG_FILE)) @echo "Deploying '$(SG_HANDBOOK_DIR)' to '$(SG_HANDBOOK_SSH_USER)@$(SG_HANDBOOK_SSH_HOST):$(SG_HANDBOOK_SSH_REMOTE_DIR)/$(SG_HANDBOOK_REVISION)'..." - @rsync -avze "ssh -p $(SG_HANDBOOK_SSH_PORT)" --perms --chmod=u+rwx,g+rx,o+rx,g-w,o-wx\ - --delete $(SG_DOCUMENTATION_HTML_DIR)/ $(SG_HANDBOOK_SSH_USER)@$(SG_HANDBOOK_SSH_HOST):$(SG_HANDBOOK_SSH_REMOTE_DIR)/$(SG_HANDBOOK_REVISION) + @cd $(SG_DOCUMENTATION_DIR) \ + && rsync -avze "ssh -p $(SG_HANDBOOK_SSH_PORT)" \ + --perms \ + --chmod=u+rwx,g+rx,o+rx,g-w,o-wx\ + --delete $(SG_DOCUMENTATION_HTML_DIR_NAME)/ \ + $(SG_HANDBOOK_SSH_USER)@$(SG_HANDBOOK_SSH_HOST):$(SG_HANDBOOK_SSH_REMOTE_DIR)/$(SG_HANDBOOK_REVISION) @echo "Copying '$(SG_DOCUMENTATION_PDF_FILE)' to '$(SG_HANDBOOK_DEPLOY_GENERATED_PDF_FILE)'..." @cp -vr $(SG_DOCUMENTATION_PDF_FILE) $(SG_HANDBOOK_DEPLOY_GENERATED_PDF_FILE) @echo "Uploading '$(SG_HANDBOOK_DEPLOY_GENERATED_PDF_FILE)' to '$(SG_HANDBOOK_SSH_USER)@$(SG_HANDBOOK_SSH_HOST):$(SG_HANDBOOK_SSH_REMOTE_DIR)/$(SG_HANDBOOK_REVISION)'..."