Merge branch 'mig5-censorship_automatically_attempt_and_reconnect' into 1422_autodetect_location

This commit is contained in:
Micah Lee 2021-12-06 20:11:41 -08:00
commit d512ce5743
164 changed files with 5100 additions and 1852 deletions

View file

@ -2,8 +2,8 @@
# Run OnionShare desktop, allowing you to use command-line arguments
SCRIPTS_DIR="$( cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )"
cd $SCRIPTS_DIR
SCRIPTS_DIR=$( cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd )
cd "$SCRIPTS_DIR"
cd ../src
python -c "import onionshare; onionshare.main()" $@
python -c "import onionshare; onionshare.main()" $@