fix the windows rsync/git bash issue: the source and destination cannot both be remote
This commit is contained in:
+15
-8
@@ -41,16 +41,19 @@ SG_PLUGIN_DIR := $(realpath $(SG_HANDBOOK_DIR)/..)
|
|||||||
SG_PLUGIN_RESOURCES_DIR := $(SG_PLUGIN_DIR)/Resources
|
SG_PLUGIN_RESOURCES_DIR := $(SG_PLUGIN_DIR)/Resources
|
||||||
SG_PLUGIN_FILE := $(SG_PLUGIN_DIR)/SenseGlove.uplugin
|
SG_PLUGIN_FILE := $(SG_PLUGIN_DIR)/SenseGlove.uplugin
|
||||||
|
|
||||||
SG_DOCUMENTATION_URL := https://unreal.docs.senseglove.com
|
SG_DOCUMENTATION_URL := https://unreal.docs.senseglove.com
|
||||||
SG_DOCUMENTATION_DIR := $(SG_PLUGIN_DIR)/Documentation
|
SG_DOCUMENTATION_DIR := $(SG_PLUGIN_DIR)/Documentation
|
||||||
SG_DOCUMENTATION_EPUB_DIR := $(SG_DOCUMENTATION_DIR)/epub
|
SG_DOCUMENTATION_EPUB_DIR := $(SG_DOCUMENTATION_DIR)/epub
|
||||||
SG_DOCUMENTATION_HTML_DIR := $(SG_DOCUMENTATION_DIR)/html
|
SG_DOCUMENTATION_HTML_DIR_NAME := html
|
||||||
SG_DOCUMENTATION_PDF_DIR := $(SG_DOCUMENTATION_DIR)/pdf-outline
|
SG_DOCUMENTATION_HTML_DIR := $(SG_DOCUMENTATION_DIR)/$(SG_DOCUMENTATION_HTML_DIR_NAME)
|
||||||
SG_DOCUMENTATION_PDF_FILE := $(SG_DOCUMENTATION_PDF_DIR)/output.pdf
|
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_LINUX := $(shell which brave-bin 2>/dev/null)
|
||||||
SG_BROWSER_BINARY_PATH_WINDOWS := C:\Program Files\BraveSoftware\Brave-Browser\Application\brave.exe
|
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
|
# Platform Detection
|
||||||
################################################################################
|
################################################################################
|
||||||
@@ -447,8 +450,12 @@ _deploy:
|
|||||||
@echo "Loading the Handbook deployment configuration file..."
|
@echo "Loading the Handbook deployment configuration file..."
|
||||||
@$(call load_env, $(SG_HANDBOOK_DEPLOY_CONFIG_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)'..."
|
@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\
|
@cd $(SG_DOCUMENTATION_DIR) \
|
||||||
--delete $(SG_DOCUMENTATION_HTML_DIR)/ $(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_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)'..."
|
@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)
|
@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)'..."
|
@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)'..."
|
||||||
|
|||||||
Reference in New Issue
Block a user