From 55c53b9c1036ce5fd8452cfed7e0a48aeede4a39 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Sun, 24 Jun 2018 21:48:42 -0700 Subject: [PATCH] Clarify license on script files As noted, Ivan has agreed to allow these scripts to be relicensed under CC0. We have one file under LGPL (a unit file we lifted wholesake from systemd) and the ADTPro wrapper which I'm pretty sure Ivan wrote, but if he didn't we need to fix its license to be the same as ADTPro. Either way, to the best of my knowledge, this resolves the question of how things are licensed explicitly. (Closes #21) --- CHANGELOG.md | 7 ++++--- LICENSE.md | 31 ++++++++++++++++++------------- setup/a2chat | 7 +++++++ setup/a2cloud-aliases | 8 ++++++++ setup/a2cloudrc | 7 +++++++ setup/a2news | 7 +++++++ setup/acmd | 7 +++++++ setup/adtpro-start | 7 +++++++ setup/adtpro.sh | 11 +++++++++++ setup/baud | 7 +++++++ setup/cppo | 8 ++++++++ setup/dopo | 7 +++++++ setup/dos2pro | 7 +++++++ setup/gsport | 7 +++++++ setup/gsport-setup | 7 +++++++ setup/ivan.sh | 7 +++++++ setup/linapple | 7 +++++++ setup/mkpo | 7 +++++++ setup/shk2image | 7 +++++++ setup/term | 7 +++++++ setup/ttyusbhandler.txt | 7 +++++++ setup/usbgetty.txt | 7 +++++++ setup/vsd | 7 +++++++ 23 files changed, 175 insertions(+), 16 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 35f25aa..33da75f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -56,9 +56,10 @@ it no longer does. more user-friendly. - Ivan Drucker has agreed to allow his scripts and future work to be - released under this more mainstream alternative to the "WTFPL". Less - "expressive", but more legally correct in countries without explicit - support for public domain or a sense of humor. ;) + released under the CC0 Public Domain release. Previously his scripts were + under the "WTFPL". Creative Commons is less "expressive", but more legally + correct in countries without explicit support for public domain or a sense + of humor. ;) - On desktop Debian systems, we now use default-jre instead of Oracle. For now we're still using Oracle on RPi, but that may soon change. diff --git a/LICENSE.md b/LICENSE.md index 0c6648c..f5ca4ff 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,13 +1,18 @@ -License for A2CLOUD -=================== - -A2CLOUD - -Copyright (C) 2013-2015 Ivan Drucker - -The A2CLOUD scripts themselves are written primarily by Ivan Drucker and -released under the WTFPL version 2, which you may download from its web page -at . This is essentially a public domain -release, which doesn't extend to the other programs used by A2CLOUD such as -ADTPro or the various Linux tools it installs. These have their own license -terms and Copyrights. +License for A2CLOUD +=================== + +a2cloud was written by: + + - [Ivan Drucker (2013-2017)][ivanx] + - [T. Joseph Carter (2015-2018)][iKarith] + +To the extent possible under law, the person who associated CC0 with +a2cloud has waived all copyright and related or neighboring rights +to a2cloud. + +You should have received a copy of the CC0 legalcode along with this +work in the file named COPYING_CC0.txt. If not, see +. + +[ivanx]: http://ivanx.com/ +[iKarith]: https://blocksfree.com/ diff --git a/setup/a2chat b/setup/a2chat index 7b87d9e..f9f1a60 100755 --- a/setup/a2chat +++ b/setup/a2chat @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# a2chat - a2cloud irc client wrapper +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + if [[ ! $(dpkg -l irssi 2> /dev/null | grep '^ii') ]]; then echo "Installing irssi..." sudo apt-get -y update diff --git a/setup/a2cloud-aliases b/setup/a2cloud-aliases index 5620e08..edbf1d4 100755 --- a/setup/a2cloud-aliases +++ b/setup/a2cloud-aliases @@ -1,5 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: + +# a2cloud-alieases - User-installed command aliases for bash +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + alias a2cloud-setup='wget -qO /tmp/a2cloud-setup ivanx.com/a2cloud/setup/; source /tmp/a2cloud-setup' alias a2cloud-help='(IFS=""; while read thisLine; do [[ ${#thisLine} -eq 0 ]] && echo || echo "$(tput bold)${thisLine%% *}$(tput sgr0) ${thisLine#* }"; done < /usr/local/etc/a2cloud-help.txt | more)' alias a2cloud-version='cat /usr/local/etc/A2CLOUD-version' diff --git a/setup/a2cloudrc b/setup/a2cloudrc index 3d70ff7..ec52016 100755 --- a/setup/a2cloudrc +++ b/setup/a2cloudrc @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# a2cloudrc - a2cloud user environment script for bash +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + source /usr/local/etc/a2cloud-aliases if [[ -f /usr/local/java/bin/java ]]; then diff --git a/setup/a2news b/setup/a2news index 654d587..9cd40d9 100755 --- a/setup/a2news +++ b/setup/a2news @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# a2news - a2cloud nntp client wrapper +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + defaultNNTP="news.aioe.org" defaultGroups="comp.emulators.apple2:\ncomp.sys.apple2:\ncomp.sys.apple2.comm:\ncomp.sys.apple2.marketplace:\ncomp.sys.apple2.programmer:\ncomp.sys.apple2.usergroups:" diff --git a/setup/acmd b/setup/acmd index 2a58e24..be78643 100755 --- a/setup/acmd +++ b/setup/acmd @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# acmd - a2cloud command-line wrapper for Apple II file utilities +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + # set default AppleCommander location if ADTPro is not installed defaultAcPath=$(echo -n /usr/local/bin/AppleCommander-*-ac.jar) diff --git a/setup/adtpro-start b/setup/adtpro-start index 46c6294..99e7ba1 100755 --- a/setup/adtpro-start +++ b/setup/adtpro-start @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# adtpro-start - script to start ADTPro "as a headless daemon", ish +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + # don't do anything if ADTPro is already running if [[ $(ps aux | grep [A]DTPro) ]]; then diff --git a/setup/adtpro.sh b/setup/adtpro.sh index 030b863..c469d23 100755 --- a/setup/adtpro.sh +++ b/setup/adtpro.sh @@ -1,6 +1,17 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# adtpro.sh - a2cloud wrapper for adtpro +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + +# This script may have some common history with the similar script found in +# ADTPro's source tree. The original may have been written by David Schmidt, +# and we should check on that. + # ADTPro - *nix startup shell script # # Note: diff --git a/setup/baud b/setup/baud index 2f46e9b..41a815e 100755 --- a/setup/baud +++ b/setup/baud @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# baud - user command to change baudrate of current terminal +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + isSystemd= isSysVInit= # If you really want something else, *you* maintain it! diff --git a/setup/cppo b/setup/cppo index c65d184..88cee36 100755 --- a/setup/cppo +++ b/setup/cppo @@ -1,6 +1,14 @@ #!/usr/bin/env python # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=python: +# cppu - a simple tool to list/extract Apple II archives and disk images +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + + """cppo: Copy/catalog files from a ProDOS/DOS 3.3/ShrinkIt image/archive. copy all files: cppo [options] imagefile target_directory diff --git a/setup/dopo b/setup/dopo index c080ead..815bc78 100755 --- a/setup/dopo +++ b/setup/dopo @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# dopo - Swap sectors on Apple II disk image between DOS and ProDOS ordering +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + # follows gzip syntax -- acts in place if filename provided, outputs to # stdout with -c, accepts stdin and outputs to stdout if filename is - or absent diff --git a/setup/dos2pro b/setup/dos2pro index ee3a3cd..f82ce21 100755 --- a/setup/dos2pro +++ b/setup/dos2pro @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# dos2pro - extract files from DOS 3.3 image and convert to ProDOS +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + readcharDec () { # read one character from file & convert to equivalent decimal value # arg1: filename diff --git a/setup/gsport b/setup/gsport index c0bdab3..351c6b0 100755 --- a/setup/gsport +++ b/setup/gsport @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# gsport - a2cloud wrapper for the GSPort emulator +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + if [[ -f /tmp/no-gsport ]]; then echo echo "Your system needs to be rebooted before you can use GSport." diff --git a/setup/gsport-setup b/setup/gsport-setup index 1628003..83f6b81 100755 --- a/setup/gsport-setup +++ b/setup/gsport-setup @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# gsport-setup - a2cloud script to download/configure assets for GSPort +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + # to do: replace Spectrum Deluxe (2.5.3) with Spectrum Gold (2.5.4) # from system_ident diff --git a/setup/ivan.sh b/setup/ivan.sh index f548bf8..2edb26f 100755 --- a/setup/ivan.sh +++ b/setup/ivan.sh @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# ivan.sh - a2cloud legacy installation script (to be removed) +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + # FIXME: Remove this when convenient. version="2.9.0" diff --git a/setup/linapple b/setup/linapple index 23c60ef..6e2bce2 100755 --- a/setup/linapple +++ b/setup/linapple @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# linapple - a2cloud wrapper script for LinApple (to be removed) +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + if [[ ( $(grep USB <<< $myTTY) || $(grep AMA <<< $myTTY) || $SSH_CLIENT || $REMOTEHOST ) && ! $DISPLAY ]]; then echo "Please run LinApple on the console, or in an X Window." else diff --git a/setup/mkpo b/setup/mkpo index 6d54930..0f25447 100755 --- a/setup/mkpo +++ b/setup/mkpo @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# mkpo - create ProDOS disk image +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + # ID-bashByter routines function binToDec () diff --git a/setup/shk2image b/setup/shk2image index a3334d7..a304873 100755 --- a/setup/shk2image +++ b/setup/shk2image @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# shk2image - Extract .shk files to Apple II disk images +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + origDir="$PWD" [[ ! -n $1 || ! -n $2 ]] && { echo "Usage: shk2image archiveFileName imageFileName [PRODOS.DIR.NAME]"; exit 1; }; imageFileName="$2"; diff --git a/setup/term b/setup/term index c30b684..99bc899 100755 --- a/setup/term +++ b/setup/term @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# term - a2cloud user command to set TERM variable (to be replaced.) +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + if [[ $1 == "-d" ]]; then shift setgetty=1 diff --git a/setup/ttyusbhandler.txt b/setup/ttyusbhandler.txt index 11e7f2c..4fc1823 100755 --- a/setup/ttyusbhandler.txt +++ b/setup/ttyusbhandler.txt @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# ttyusbhandler.sh - a2cloud udev handler for USB serial devices (to be replaced) +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + # called by udev as: # ttyusbhandler [add|remove] ttyUSBname diff --git a/setup/usbgetty.txt b/setup/usbgetty.txt index 9058a2d..b713482 100755 --- a/setup/usbgetty.txt +++ b/setup/usbgetty.txt @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# usbgetty.sh - a2cloud script to start a getty on a USB serial devie (to be replaced.) +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + ttyUSB= pkill -f "sleep 86399" diff --git a/setup/vsd b/setup/vsd index bc87e50..c25c272 100755 --- a/setup/vsd +++ b/setup/vsd @@ -1,6 +1,13 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: +# vsd - a2cloud script to change ADTPro virtual disk image symlinks +# +# To the extent possible under law, T. Joseph Carter and Ivan Drucker have +# waived all copyright and related or neighboring rights to the a2cloud +# scripts themselves. Software used or installed by these scripts is subject +# to other licenses. This work is published from the United States. + skipWarning= drive= if [[ $1 == "-1" || $1 == "-d1" ]]; then