diff --git a/.circleci/config.yml b/.circleci/config.yml index 175595f3..7ed09749 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -30,7 +30,7 @@ jobs: command: | cd ~/repo/cli poetry run pytest -v ./tests - + test-gui: docker: - image: circleci/python:3.8-buster diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index f1d47856..2285b1fc 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -47,7 +47,7 @@ jobs: # Prefix the list here with "+" to use these queries and those in the config file. # queries: ./path/to/local/query, your-org/your-repo/queries@main - # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). + # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild uses: github/codeql-action/autobuild@v1 diff --git a/build-source.sh b/build-source.sh index add57583..0946683d 100755 --- a/build-source.sh +++ b/build-source.sh @@ -4,7 +4,7 @@ # Usage display_usage() { - echo "Usage: $0 [tag]" + echo "Usage: $0 [tag]" } if [ $# -lt 1 ] @@ -46,13 +46,13 @@ then echo "Tag does not verify" exit 1 fi -cat ../verify.txt |grep "using RSA key 927F419D7EC82C2F149C1BD1403C2657CD994F73" +cat ../verify.txt | grep "using RSA key 927F419D7EC82C2F149C1BD1403C2657CD994F73" if [ $? -ne 0 ] then echo "Tag signed with wrong key" exit 1 fi -cat ../verify.txt |grep "^gpg: Good signature from" +cat ../verify.txt | grep "^gpg: Good signature from" if [ $? -ne 0 ] then echo "Tag verification missing 'Good signature from'" diff --git a/cli/onionshare_cli/resources/static/css/style.css b/cli/onionshare_cli/resources/static/css/style.css index 7cec9738..79be31d0 100644 --- a/cli/onionshare_cli/resources/static/css/style.css +++ b/cli/onionshare_cli/resources/static/css/style.css @@ -320,15 +320,15 @@ div#uploads .upload .upload-status { } div#uploads .upload input.cancel { - color: #d0011b; + color: #d0011b; border: 0; background: none; box-shadow: none; border-radius: 0px; - cursor: pointer; - font-family: sans-serif; - font-size: 12px; - text-decoration: none; + cursor: pointer; + font-family: sans-serif; + font-size: 12px; + text-decoration: none; display: inline-block; float:right; } @@ -398,4 +398,4 @@ a { a:visited { color: #601ca0; -} \ No newline at end of file +} diff --git a/cli/onionshare_cli/resources/static/js/chat.js b/cli/onionshare_cli/resources/static/js/chat.js index 35113df5..b4ef30df 100644 --- a/cli/onionshare_cli/resources/static/js/chat.js +++ b/cli/onionshare_cli/resources/static/js/chat.js @@ -11,7 +11,7 @@ $(function () { // Store current username received from app context var current_username = $('#username').val(); - // On browser connect, emit a socket event to be added to + // On browser connect, emit a socket event to be added to // room and assigned random username socket.on('connect', function () { socket.emit('joined', {}); diff --git a/cli/onionshare_cli/resources/templates/403.html b/cli/onionshare_cli/resources/templates/403.html index c9d28eea..eff250e6 100644 --- a/cli/onionshare_cli/resources/templates/403.html +++ b/cli/onionshare_cli/resources/templates/403.html @@ -4,7 +4,7 @@ OnionShare: 403 Forbidden - + diff --git a/cli/onionshare_cli/resources/templates/404.html b/cli/onionshare_cli/resources/templates/404.html index e816f2c4..c921aa3e 100644 --- a/cli/onionshare_cli/resources/templates/404.html +++ b/cli/onionshare_cli/resources/templates/404.html @@ -4,7 +4,7 @@ OnionShare: 404 Not Found - + diff --git a/cli/onionshare_cli/resources/templates/405.html b/cli/onionshare_cli/resources/templates/405.html index 63888004..76c32c19 100644 --- a/cli/onionshare_cli/resources/templates/405.html +++ b/cli/onionshare_cli/resources/templates/405.html @@ -4,7 +4,7 @@ OnionShare: 405 Method Not Allowed - + diff --git a/cli/onionshare_cli/resources/templates/500.html b/cli/onionshare_cli/resources/templates/500.html index 9f6727d2..f6501a21 100644 --- a/cli/onionshare_cli/resources/templates/500.html +++ b/cli/onionshare_cli/resources/templates/500.html @@ -4,7 +4,7 @@ OnionShare: An error occurred - + diff --git a/desktop/scripts/dev.sh b/desktop/scripts/dev.sh index bf65e407..18fade68 100755 --- a/desktop/scripts/dev.sh +++ b/desktop/scripts/dev.sh @@ -6,4 +6,4 @@ SCRIPTS_DIR=$( cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null 2>&1 && pwd ) cd "$SCRIPTS_DIR" cd ../src -python -c "import onionshare; onionshare.main()" $@ \ No newline at end of file +python -c "import onionshare; onionshare.main()" $@ diff --git a/docs/README.md b/docs/README.md index 029217bb..fbcf06d9 100644 --- a/docs/README.md +++ b/docs/README.md @@ -27,7 +27,7 @@ You will end up with the documentation in all supported locales in `docs/localiz Here's how preparing translations works: ```sh -# Generate .po files in build/gettext +# Generate .po files in build/gettext make gettext # Create a new blank German locale in source/locale, based on .po files diff --git a/docs/source/develop.rst b/docs/source/develop.rst index 042800c4..224c063f 100644 --- a/docs/source/develop.rst +++ b/docs/source/develop.rst @@ -40,7 +40,7 @@ Verbose mode When developing, it's convenient to run OnionShare from a terminal and add the ``--verbose`` (or ``-v``) flag to the command. This prints a lot of helpful messages to the terminal, such as when certain objects are initialized, when events occur (like buttons clicked, settings saved or reloaded), and other debug info. For example:: - $ $ poetry run onionshare-cli -v ~/Documents/roms/nes/Q-bert\ \(USA\).nes + $ poetry run onionshare-cli -v ~/Documents/roms/nes/Q-bert\ \(USA\).nes ╭───────────────────────────────────────────╮ │ * ▄▄█████▄▄ * │ │ ▄████▀▀▀████▄ * │ diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 9bbc58ae..2b2ca61e 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -3,9 +3,9 @@ base: core18 version: '2.4' summary: Securely and anonymously share files, host websites, and chat using Tor description: | - OnionShare lets you securely and anonymously send and receive files. It works by starting - a web server, making it accessible as a Tor onion service, and generating an unguessable - web address so others can download files from you, or upload files to you. It does _not_ + OnionShare lets you securely and anonymously send and receive files. It works by starting + a web server, making it accessible as a Tor onion service, and generating an unguessable + web address so others can download files from you, or upload files to you. It does _not_ require setting up a separate server or using a third party file-sharing service. grade: stable # stable or devel @@ -23,7 +23,7 @@ apps: - removable-media environment: LANG: C.UTF-8 - + cli: common-id: org.onionshare.OnionShareCli command: onionshare-cli @@ -146,7 +146,7 @@ parts: - libssl-dev - zlib1g-dev after: [libevent] - + libevent: source: https://github.com/libevent/libevent/releases/download/release-2.1.12-stable/libevent-2.1.12-stable.tar.gz source-checksum: sha256/92e6de1be9ec176428fd2367677e61ceffc2ee1cb119035037a27d346b0403bb