From a3d67123cc7cd1e1af4543d672f067c67b8b6825 Mon Sep 17 00:00:00 2001 From: "T. Joseph Carter" Date: Sun, 22 Apr 2018 14:44:27 -0700 Subject: [PATCH] Removed a2cScriptURL and renmaed .txt from scripts Replaced downloading scripts and files from a2cScriptURL with installation from the source tree. This obsoletes a2cScriptURL, so it's been removed. It made sense to remove the .txt from the script names since I was rewriting the lines that use them anyway. --- setup/{a2chat.txt => a2chat} | 0 setup/{a2news.txt => a2news} | 0 setup/{acmd.txt => acmd} | 0 setup/{adtpro-start.txt => adtpro-start} | 0 setup/{adtpro.sh.txt => adtpro.sh} | 0 setup/{baud.txt => baud} | 0 setup/{dos2pro.txt => dos2pro} | 0 setup/{gsport.txt => gsport} | 0 setup/{gsport-setup.txt => gsport-setup} | 0 ...ort-setup-shell.txt => gsport-setup-shell} | 2 +- setup/ivan.sh | 57 +++++++------------ setup/{linapple.txt => linapple} | 0 setup/{mkpo.txt => mkpo} | 0 setup/{shk2image.txt => shk2image} | 0 setup/{term.txt => term} | 0 ...d.service.txt => usbgetty-systemd.service} | 0 setup/{vsd.txt => vsd} | 0 17 files changed, 21 insertions(+), 38 deletions(-) rename setup/{a2chat.txt => a2chat} (100%) rename setup/{a2news.txt => a2news} (100%) rename setup/{acmd.txt => acmd} (100%) rename setup/{adtpro-start.txt => adtpro-start} (100%) rename setup/{adtpro.sh.txt => adtpro.sh} (100%) rename setup/{baud.txt => baud} (100%) rename setup/{dos2pro.txt => dos2pro} (100%) rename setup/{gsport.txt => gsport} (100%) rename setup/{gsport-setup.txt => gsport-setup} (100%) rename setup/{gsport-setup-shell.txt => gsport-setup-shell} (86%) rename setup/{linapple.txt => linapple} (100%) rename setup/{mkpo.txt => mkpo} (100%) rename setup/{shk2image.txt => shk2image} (100%) rename setup/{term.txt => term} (100%) rename setup/{usbgetty-systemd.service.txt => usbgetty-systemd.service} (100%) rename setup/{vsd.txt => vsd} (100%) diff --git a/setup/a2chat.txt b/setup/a2chat similarity index 100% rename from setup/a2chat.txt rename to setup/a2chat diff --git a/setup/a2news.txt b/setup/a2news similarity index 100% rename from setup/a2news.txt rename to setup/a2news diff --git a/setup/acmd.txt b/setup/acmd similarity index 100% rename from setup/acmd.txt rename to setup/acmd diff --git a/setup/adtpro-start.txt b/setup/adtpro-start similarity index 100% rename from setup/adtpro-start.txt rename to setup/adtpro-start diff --git a/setup/adtpro.sh.txt b/setup/adtpro.sh similarity index 100% rename from setup/adtpro.sh.txt rename to setup/adtpro.sh diff --git a/setup/baud.txt b/setup/baud similarity index 100% rename from setup/baud.txt rename to setup/baud diff --git a/setup/dos2pro.txt b/setup/dos2pro similarity index 100% rename from setup/dos2pro.txt rename to setup/dos2pro diff --git a/setup/gsport.txt b/setup/gsport similarity index 100% rename from setup/gsport.txt rename to setup/gsport diff --git a/setup/gsport-setup.txt b/setup/gsport-setup similarity index 100% rename from setup/gsport-setup.txt rename to setup/gsport-setup diff --git a/setup/gsport-setup-shell.txt b/setup/gsport-setup-shell similarity index 86% rename from setup/gsport-setup-shell.txt rename to setup/gsport-setup-shell index 75fb199..bbb6801 100755 --- a/setup/gsport-setup-shell.txt +++ b/setup/gsport-setup-shell @@ -1,7 +1,7 @@ #! /bin/bash # vim: set tabstop=4 shiftwidth=4 noexpandtab filetype=sh: -wget -qO /tmp/gsport-setup https://raw.githubusercontent.com/RasppleII/a2cloud/master/setup/gsport-setup.txt +wget -qO /tmp/gsport-setup https://raw.githubusercontent.com/RasppleII/a2cloud/master/setup/gsport-setup if [[ $(wc -c /tmp/gsport-setup | grep '^0 ') ]]; then echo "Please connect to the internet to set up GSport." else diff --git a/setup/ivan.sh b/setup/ivan.sh index 2cd48c7..8f1a5a9 100755 --- a/setup/ivan.sh +++ b/setup/ivan.sh @@ -3,7 +3,6 @@ version="2.9.0" adtProVersion="2.0.1" -a2cScriptURL="https://raw.githubusercontent.com/RasppleII/a2cloud/master" a2cBinaryURL="http://blocksfree.com/downloads" # Find the path of our source directory @@ -334,11 +333,11 @@ source /usr/local/etc/a2cloudrc # this up at some point. echo "A2CLOUD: Setting up motd..." if [[ $(grep Raspple /etc/motd) ]]; then - wget -qO- "${a2cScriptURL}/setup/motd-rasppleii.txt" | sudo tee /etc/motd > /dev/null + sudo install -u root -g root -m 644 "$a2cSource/setup/motd-rasppleii.txt" /etc/motd elif [[ $(grep A2SERVER /etc/motd) ]]; then - wget -qO- "${a2cScriptURL}/setup/motd-vm.txt" | sudo tee /etc/motd > /dev/null + sudo install -u root -g root -m 644 "$a2cSource/setup/motd-vm.txt" /etc/motd else - wget -qO- "${a2cScriptURL}/setup/motd.txt" | sudo tee /etc/motd > /dev/null + sudo install -u root -g root -m 644 "$a2cSource/setup/motd.txt" /etc/motd fi if lspci 2> /dev/null | grep -q VirtualBox; then @@ -520,8 +519,7 @@ if [[ $installADTPro ]]; then ### ADTPro: Install our modified adtpro.sh echo "A2CLOUD: Setting up customized adtpro.sh..." - wget -qO /usr/local/adtpro/adtpro.sh "${a2cScriptURL}/setup/adtpro.sh.txt" - sudo chmod ugo+rwx /usr/local/adtpro/adtpro.sh + sudo install -u root -g root -m 755 ${a2cSource}/setup/adtpro.sh /usr/local/bin/adtpro.sh ### ADTPro: Replace A2CLOUD's disks with the ones ... ### FIXME: where are these created/downloaded to move? @@ -599,24 +597,19 @@ if [[ $installADTPro ]]; then ### A2CLOUD: Install various shell scripts echo "A2CLOUD: Setting up adtpro-start command..." - sudo wget -qO /usr/local/bin/adtpro-start ${a2cScriptURL}/setup/adtpro-start.txt - sudo chmod ugo+x /usr/local/bin/adtpro-start + sudo install -u root -g root -m 755 "$a2cSource/setup/adtpro-start" /usr/local/bin/adtpro-start echo "A2CLOUD: Setting up vsd1/vsd2 commands..." - sudo wget -qO /usr/local/bin/vsd ${a2cScriptURL}/setup/vsd.txt - sudo chmod ugo+x /usr/local/bin/vsd + sudo install -u root -g root -m 755 "$a2cSource/setup/vsd" /usr/local/bin/vsd echo "A2CLOUD: Setting up acmd command..." - sudo wget -qO /usr/local/bin/acmd ${a2cScriptURL}/setup/acmd.txt - sudo chmod ugo+x /usr/local/bin/acmd + sudo install -u root -g root -m 755 "$a2cSource/setup/acmd" /usr/local/bin/acmd echo "A2CLOUD: Setting up mkpo command..." - sudo wget -qO /usr/local/bin/mkpo ${a2cScriptURL}/setup/mkpo.txt - sudo chmod ugo+x /usr/local/bin/mkpo + sudo install -u root -g root -m 755 "$a2cSource/setup/mkpo" /usr/local/bin/mkpo echo "A2CLOUD: Setting up dos2pro command..." - sudo wget -qO /usr/local/bin/dos2pro ${a2cScriptURL}/setup/dos2pro.txt - sudo chmod ugo+x /usr/local/bin/dos2pro + sudo install -u root -g root -m 755 "$a2cSource/setup/dos2pro" /usr/local/bin/dos2pro fi @@ -635,8 +628,7 @@ fi ### A2CLOUD: Install serial port rules/scripts echo "A2CLOUD: Setting up USB port serial adapter handler..." -sudo wget -qO /usr/local/sbin/ttyusbhandler ${a2cScriptURL}/setup/ttyusbhandler.txt -sudo chmod ugo+x /usr/local/sbin/ttyusbhandler +sudo install -u root -g root -m 755 "$a2cSource/setup/ttyusbhandler" /usr/local/sbin/ttyusbhandler if [[ ! -f /etc/udev/rules.d/50-usb.rules ]]; then echo "A2CLOUD: Creating device rules for USB ports..." @@ -725,17 +717,14 @@ if [[ $setupSerialPortLogin ]]; then ### SerialCon: Install serial login command scripts echo "A2CLOUD: Setting up baud command..." - sudo wget -qO /usr/local/bin/baud ${a2cScriptURL}/setup/baud.txt - sudo chmod ugo+x /usr/local/bin/baud + sudo install -u root -g root -m 755 "$a2cSource/setup/baud" /usr/local/bin/baud echo "A2CLOUD: Setting up term command..." - sudo wget -qO /usr/local/bin/term ${a2cScriptURL}/setup/term.txt - sudo chmod ugo+x /usr/local/bin/term + sudo install -u root -g root -m 755 "$a2cSource/setup/term" /usr/local/bin/term ### SerialCon: Install USB serial port login echo "A2CLOUD: Setting up USB shell login..." - sudo wget -qO /usr/local/sbin/usbgetty ${a2cScriptURL}/setup/usbgetty.txt - sudo chmod ugo+x /usr/local/sbin/usbgetty + sudo install -u root -g root -m 755 "$a2cSource/setup/usbgetty" /usr/local/sbin/usbgetty if [[ -n "$isSystemd" ]]; then # FIXME: Okay, the way we need to fix this is that we need to do the # -scanttyUSB behavior and create a symlink in udev here. If we have @@ -748,7 +737,7 @@ if [[ $setupSerialPortLogin ]]; then # (called by udev, as before) now restarts the service upon adapter insertion. # This might not be the best way to do it, but it works for now, # apart from a 30 second delay before the getty becomes available. - sudo wget -qO /etc/systemd/system/getty.target.wants/usbgetty@.service ${a2cScriptURL}/setup/usbgetty-systemd.service.txt + sudo install -u root -g root -m 644 "$a2cSource/setup/usbgetty-systemd.service" /etc/systemd/system/getty.target.wants/usbgetty@.service pwd=$PWD cd /etc/systemd/system/getty.target.wants grep -o 'SYMLINK+="ttyUSB.*,' /etc/udev/rules.d/50-usb.rules | cut -d '"' -f 2 | \ @@ -852,8 +841,7 @@ if [[ $installCommTools ]]; then fi ### CommTools: Install tin + a2news script - sudo wget -qO /usr/local/bin/a2news ${a2cScriptURL}/setup/a2news.txt - sudo chmod ugo+x /usr/local/bin/a2news + sudo install -u root -g root -m 755 "$a2cSource/setup/a2news" /usr/local/bin/a2news if ! hash tin 2> /dev/null; then echo "A2CLOUD: Installing a2news/tin..." sudo apt-get -y install tin @@ -879,8 +867,7 @@ if [[ $installCommTools ]]; then fi ### CommTools: Install irssi + a2chat script - sudo wget -qO /usr/local/bin/a2chat ${a2cScriptURL}/setup/a2chat.txt - sudo chmod ugo+x /usr/local/bin/a2chat + sudo install -u root -g root -m 755 "$a2cSource/setup/a2chat" /usr/local/bin/a2chat if ! hash irssi 2> /dev/null; then echo "A2CLOUD: Installing a2chat/irssi..." sudo apt-get -y install irssi @@ -1056,10 +1043,8 @@ if [[ $installEmulators ]]; then sudo chgrp gsport /usr/local/bin/gsportx sudo chmod u+s /usr/local/bin/gsportx - sudo wget -qO /usr/local/bin/gsport ${a2cScriptURL}/setup/gsport.txt - sudo chmod ugo+x /usr/local/bin/gsport - sudo wget -qO /usr/local/bin/gsport-setup ${a2cScriptURL}/setup/gsport-setup-shell.txt - sudo chmod ugo+x /usr/local/bin/gsport-setup + sudo install -u root -g root -m 755 "$a2cSource/setup/gsport" /usr/local/bin/gsport + sudo install -u root -g root -m 755 "$a2cSource/setup/gsport-setup" /usr/local/bin/gsport-setup else echo "A2CLOUD: GSport is already installed." @@ -1094,8 +1079,7 @@ if [[ $installEmulators ]]; then echo "A2CLOUD: LinApple is already installed." fi echo "A2CLOUD: Updating LinApple launch file..." - sudo wget -qO /usr/local/bin/linapple ${a2cScriptURL}/setup/linapple.txt - sudo chmod ugo+x /usr/local/bin/linapple + sudo install -u root -g root -m 755 "$a2cSource/setup/linapple" /usr/local/bin/linapple ### Emulators: Set Groups sudo addgroup gsport &> /dev/null @@ -1163,8 +1147,7 @@ if [[ $installArchiveTools ]]; then echo "A2CLOUD: Setting up shk2image command..." ### ArchiveTools: Install shk2image command - sudo wget -qO /usr/local/bin/shk2image ${a2cScriptURL}/setup/shk2image.txt - sudo chmod ugo+x /usr/local/bin/shk2image + sudo install -u root -g root -m 755 "$a2cSource/setup/shk2image" /usr/local/bin/shk2image # http://wakaba.c3.cx/s/apps/unarchiver.html if ! hash unar 2> /dev/null; then diff --git a/setup/linapple.txt b/setup/linapple similarity index 100% rename from setup/linapple.txt rename to setup/linapple diff --git a/setup/mkpo.txt b/setup/mkpo similarity index 100% rename from setup/mkpo.txt rename to setup/mkpo diff --git a/setup/shk2image.txt b/setup/shk2image similarity index 100% rename from setup/shk2image.txt rename to setup/shk2image diff --git a/setup/term.txt b/setup/term similarity index 100% rename from setup/term.txt rename to setup/term diff --git a/setup/usbgetty-systemd.service.txt b/setup/usbgetty-systemd.service similarity index 100% rename from setup/usbgetty-systemd.service.txt rename to setup/usbgetty-systemd.service diff --git a/setup/vsd.txt b/setup/vsd similarity index 100% rename from setup/vsd.txt rename to setup/vsd