From e41d35eccf20883f24f14e97b632d66a4849883c Mon Sep 17 00:00:00 2001
From: Michele Cereda <michele.cereda@protonmail.com>
Date: Tue, 19 Oct 2021 00:38:32 +0200
Subject: [PATCH] Improved dropbox management

---
 scripts/dropbox/install-control-script.bash  | 22 ++++++++++++++++++++
 scripts/dropbox/update-multiple-instances.sh | 19 +++++++++++++----
 2 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 scripts/dropbox/install-control-script.bash

diff --git a/scripts/dropbox/install-control-script.bash b/scripts/dropbox/install-control-script.bash
new file mode 100644
index 0000000..d093e97
--- /dev/null
+++ b/scripts/dropbox/install-control-script.bash
@@ -0,0 +1,22 @@
+#!/usr/bin/bash
+# https://www.dropbox.com/install-linux
+
+[[ ${DEBUG} ]] && set -o xtrace
+
+DROPBOX_retries=3
+DROPBOX_script_download_path="/tmp/dropbox.py"
+DROPBOX_script_installation_path="/usr/local/bin/dropbox"
+DROPBOX_script_url="https://www.dropbox.com/download?dl=packages/dropbox.py"
+
+echo "  downloading script…"
+curl $DROPBOX_script_url \
+	--continue-at - \
+	--location \
+   	--output $DROPBOX_script_download_path \
+	--retry $DROPBOX_retries \
+	--silent --show-error
+
+echo "  installing script…"
+sudo install $DROPBOX_script_download_path $DROPBOX_script_installation_path
+
+[[ ${DEBUG} ]] && set +o xtrace
diff --git a/scripts/dropbox/update-multiple-instances.sh b/scripts/dropbox/update-multiple-instances.sh
index 806e809..d004706 100644
--- a/scripts/dropbox/update-multiple-instances.sh
+++ b/scripts/dropbox/update-multiple-instances.sh
@@ -1,20 +1,31 @@
 #!/usr/bin/env sh
 
 function dropbox-install {
-	export DROPBOX_archive="dropbox_daemon.tar.gz"
-	export DROPBOX_retries="3"
-	export DROPBOX_url="http://www.getdropbox.com/download?plat=lnx.x86_64"
+	# https://www.dropbox.com/install-linux
+	[[ ${DEBUG} ]] && set -o xtrace
+
+	DROPBOX_archive="/tmp/dropbox_daemon.tar.gz"
+	DROPBOX_retries="3"
+	DROPBOX_url="http://www.getdropbox.com/download?plat=lnx.x86_64"
 
 	# download daemon
 	echo "  downloading archive…"
-	curl -C - -o $DROPBOX_archive --retry $DROPBOX_retries -S -L $DROPBOX_url
+	curl $DROPBOX_url \
+		--continue-at - \
+		--location \
+    	--output $DROPBOX_archive \
+		--retry $DROPBOX_retries \
+		--silent --show-error
 
 	# install daemon
+	[[ -d "${HOME}/.dropbox-dist" ]] && echo "  removing old executables…" && rm -r "${HOME}/.dropbox-dist"
 	echo "  unarchiving tarball…"
 	tar zxf $DROPBOX_archive -C $HOME
 
 	# cleaning
 	rm $DROPBOX_archive
+
+	[[ ${DEBUG} ]] && set +o xtrace
 }
 
 if [ ! -f start-multiple-instances.sh ]