Merge branch 'Mario/confirm_rsync' into 'master'

Merge branch Mario/confirm_rsync (XS merge request)

Closes #148

See merge request xonotic/xonotic!73

diff --git a/misc/tools/rsync-updater/update-to-autobuild.bat b/misc/tools/rsync-updater/update-to-autobuild.bat
old mode 100644 (file)
new mode 100755 (executable)
index 911628c..498e2af
--- a/misc/tools/rsync-updater/update-to-autobuild.bat
+++ b/misc/tools/rsync-updater/update-to-autobuild.bat
@@ -10,6 +10,9 @@ exit
 \r
 :copied\r
 \r
+set /p choice=This script will DELETE any custom files in the Xonotic folder. Do you want to continue [Y/N]?\r
+if /i not "%choice%" == "Y" goto end\r
+\r
 set buildtype=release\r
 if "%~n0" == "update-to-autobuild" set buildtype=autobuild\r
 \r

diff --git a/misc/tools/rsync-updater/update-to-autobuild.sh b/misc/tools/rsync-updater/update-to-autobuild.sh
index b0d429dd2d6fd5c3bd20ba89936ea0e0076cf098..294af5d7815879e27a16bafd8fdd62cbc9aa6c51 100755 (executable)
--- a/misc/tools/rsync-updater/update-to-autobuild.sh
+++ b/misc/tools/rsync-updater/update-to-autobuild.sh
@@ -9,6 +9,13 @@ if ! which rsync >/dev/null; then
        exit 1
 fi
 
+read -rp "This script will DELETE any custom files in the Xonotic folder. Do you want to continue [Y/N]?" choice
+case "$choice" in
+  Y) ;;
+  y) ;;
+  *) exit 1 ;;
+esac
+
 case "${0##*/}" in
        update-to-autobuild.sh)
                buildtype=autobuild

diff --git a/misc/tools/rsync-updater/update-to-release.bat b/misc/tools/rsync-updater/update-to-release.bat
old mode 100644 (file)
new mode 100755 (executable)
index 911628c..498e2af
--- a/misc/tools/rsync-updater/update-to-release.bat
+++ b/misc/tools/rsync-updater/update-to-release.bat
@@ -10,6 +10,9 @@ exit
 \r
 :copied\r
 \r
+set /p choice=This script will DELETE any custom files in the Xonotic folder. Do you want to continue [Y/N]?\r
+if /i not "%choice%" == "Y" goto end\r
+\r
 set buildtype=release\r
 if "%~n0" == "update-to-autobuild" set buildtype=autobuild\r
 \r

diff --git a/misc/tools/rsync-updater/update-to-release.sh b/misc/tools/rsync-updater/update-to-release.sh
index b0d429dd2d6fd5c3bd20ba89936ea0e0076cf098..294af5d7815879e27a16bafd8fdd62cbc9aa6c51 100755 (executable)
--- a/misc/tools/rsync-updater/update-to-release.sh
+++ b/misc/tools/rsync-updater/update-to-release.sh
@@ -9,6 +9,13 @@ if ! which rsync >/dev/null; then
        exit 1
 fi
 
+read -rp "This script will DELETE any custom files in the Xonotic folder. Do you want to continue [Y/N]?" choice
+case "$choice" in
+  Y) ;;
+  y) ;;
+  *) exit 1 ;;
+esac
+
 case "${0##*/}" in
        update-to-autobuild.sh)
                buildtype=autobuild