diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rwxr-xr-x | build.sh | 8 | ||||
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | copyright | 5 | ||||
| -rwxr-xr-x | upload_amo.sh | 15 |
5 files changed, 10 insertions, 24 deletions
diff --git a/Makefile.in b/Makefile.in index b363532..b65fd9a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -16,7 +16,7 @@ VPATH = <<VPATH>> version = <<VERSION>> extension_files = background/ common/ content/ html/ licenses/ \ - copyright default_settings.json manifest.json + copyright default_settings.json manifest.json metafiles = build.sh configure Makefile.in process_html_file.sh README.txt \ re-generate_icons.sh shell_utils.sh upload_amo.sh write_makefile.sh @@ -175,7 +175,7 @@ build_main() { POPUPSCRIPTS="$(as_html_list $COMPUTED_SCRIPTS)" eval "$(compute_scripts_list html/options_main.js || exit 1)" OPTIONSSCRIPTS="$(as_html_list $COMPUTED_SCRIPTS)" - + for DIR in $(find $SCRIPTDIRS -type d); do mkdir -p "$BUILDDIR"/$DIR done @@ -183,7 +183,7 @@ build_main() { CHROMIUM_KEY='' CHROMIUM_UPDATE_URL='' GECKO_APPLICATIONS='' - + if [ "x$UPDATE_URL" != x ]; then UPDATE_URL=",\n \"update_url\": \"$UPDATE_URL\"" fi @@ -302,7 +302,7 @@ main() { errcho "usage: $0 mozilla|chromium [source directory] [update url]" exit 1 fi - + SRCDIR="${2:-.}" if [ -d "$SRCDIR" ]; then BUILDDIR="$(realpath $BROWSER-unpacked)" @@ -313,7 +313,7 @@ main() { errcho "usage: $0 mozilla|chromium [source directory] [update url]" exit 2 fi - + UPDATE_URL="$3" . ./shell_utils.sh @@ -28,7 +28,7 @@ while [ "x$1" != x ]; do "UPDATE_URL"=*) UPDATE_URL="$(echo "$1" | cut -c 12-)";; --host=*) TARGET="$(echo "$1" | cut -c 8-)";; --host) TARGET="$2"; shift;; - + # browsers chromium | chrome | google-chrome | mozilla |\ firefox | librewolf | icecat | iceweasel | abrowser |\ @@ -41,7 +41,7 @@ done # Autodetect srcdir if [ "x$SRCDIR" = x ]; then SRCDIR=.. - if [ -f manifest.json ] && [ -f write_makefile.sh]; then + if [ -f manifest.json ] && [ -f write_makefile.sh ]; then SRCDIR=. fi fi @@ -15,11 +15,6 @@ Files: Makefile Copyright: 2021 jahoti <jahoti@tilde.team> License: CC0 -Files: upload_amo.sh -Copyright: 2021 Wojtek Kosior <koszko@koszko.org> -License: GPL-3+ -Comment: Wojtek Kosior promises not to sue. - Files: icons/* Copyright: 2017 David Lyons <https://openclipart.org/artist/davidblyons> License: CC0 or CC-BY-SA-4.0 diff --git a/upload_amo.sh b/upload_amo.sh index 2f519c8..115f39a 100755 --- a/upload_amo.sh +++ b/upload_amo.sh @@ -5,22 +5,13 @@ # Copyright (C) 2021, Wojtek Kosior # # This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. +# it under the terms of the CC0 1.0 Universal License as published by +# the Creative Commons Corporation. # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see <https://www.gnu.org/licenses/>. -# -# -# I, Wojtek Kosior, thereby promise not to sue for violation of this file's -# license. Although I request that you do not make use this code in a -# proprietary program, I am not going to enforce this in court. +# CC0 1.0 Universal License for more details. set -e |