From 986394653a9242a8f4865dfe8389d0ab7d4bf8de Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Wed, 12 Jul 2017 22:08:53 -0700 Subject: [PATCH 01/14] install nodejs 6.x instead of the old 0.10 that debian defaults to --- scripts/quick-packages.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/quick-packages.sh b/scripts/quick-packages.sh index 21e25fa8d..e172094b3 100644 --- a/scripts/quick-packages.sh +++ b/scripts/quick-packages.sh @@ -3,7 +3,9 @@ # TODO: remove the `-o Acquire::ForceIPv4=true` once Debian's mirrors work reliably over IPv6 apt-get -o Acquire::ForceIPv4=true install -y sudo sudo apt-get -o Acquire::ForceIPv4=true update && sudo apt-get -o Acquire::ForceIPv4=true -y upgrade -sudo apt-get -o Acquire::ForceIPv4=true install -y git python python-dev python-software-properties python-numpy python-pip nodejs-legacy npm watchdog strace tcpdump screen acpid vim locate jq lm-sensors && \ +# install nodejs 6.x instead of the old 0.10 that debian defaults to +curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - +sudo apt-get -o Acquire::ForceIPv4=true install -y git python python-dev python-software-properties python-numpy python-pip nodejs npm watchdog strace tcpdump screen acpid vim locate jq lm-sensors && \ sudo pip install -U openaps && \ sudo pip install -U openaps-contrib && \ sudo openaps-install-udev-rules && \ From 936122b10b8e6e35ad5e5503836f94caf07475eb Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Wed, 12 Jul 2017 22:10:13 -0700 Subject: [PATCH 02/14] nodejs-6 version of openaps-install.sh --- scripts/openaps-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/openaps-install.sh b/scripts/openaps-install.sh index cf890daf6..362e9c7be 100644 --- a/scripts/openaps-install.sh +++ b/scripts/openaps-install.sh @@ -24,8 +24,8 @@ adduser edison dialout sed -i "s/daily/hourly/g" /etc/logrotate.conf sed -i "s/#compress/compress/g" /etc/logrotate.conf -# TODO: change back to master after docs release -curl -s https://raw.githubusercontent.com/openaps/docs/dev/scripts/quick-packages.sh | bash - +# TODO: change back to dev after merging nodejs-6 to dev, then to master after docs release +curl -s https://raw.githubusercontent.com/openaps/docs/nodejs-6/scripts/quick-packages.sh | bash - mkdir -p ~/src; cd ~/src && git clone git://github.com/openaps/oref0.git || (cd oref0 && git checkout master && git pull) echo "Press Enter to run oref0-setup with the current release (master branch) of oref0," read -p "or press ctrl-c to cancel. " -r From 3b872178da34e8027acf8e82661f88ff6a4d732d Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Wed, 12 Jul 2017 22:12:34 -0700 Subject: [PATCH 03/14] nodejs-6 version of openaps-bootstrap.sh --- scripts/openaps-boostrap.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/openaps-boostrap.sh b/scripts/openaps-boostrap.sh index 31b2324ec..1d5638c74 100644 --- a/scripts/openaps-boostrap.sh +++ b/scripts/openaps-boostrap.sh @@ -28,5 +28,6 @@ ifdown wlan0; ifup wlan0 echo -ne "\nWifi SSID: "; iwgetid -r sleep 5 # TODO check for options to fix the certificate activation error message for https -cd /tmp/; wget --no-check-certificate https://raw.githubusercontent.com/openaps/docs/dev/scripts/openaps-install.sh; bash ./openaps-install.sh +# TODO: change back to dev after merging nodejs-6 to dev, then to master after docs release +cd /tmp/; wget --no-check-certificate https://raw.githubusercontent.com/openaps/docs/nodejs-6/scripts/openaps-install.sh; bash ./openaps-install.sh ) From c53c7b7be53f5f3aba9a6f0b347d2f914ca61c95 Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Wed, 12 Jul 2017 22:17:56 -0700 Subject: [PATCH 04/14] remove openaps-boostrap.sh (typo) --- scripts/openaps-boostrap.sh | 33 --------------------------------- 1 file changed, 33 deletions(-) delete mode 100644 scripts/openaps-boostrap.sh diff --git a/scripts/openaps-boostrap.sh b/scripts/openaps-boostrap.sh deleted file mode 100644 index 1d5638c74..000000000 --- a/scripts/openaps-boostrap.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/bash -( -echo Scanning for wifi networks: -ifup wlan0 -wpa_cli scan -echo -e "\nStrongest networks found:" -wpa_cli scan_res | sort -grk 3 | head | awk -F '\t' '{print $NF}' | uniq -set -e -echo -e /"\nWARNING: this script will back up and remove all of your current wifi configs." -read -p "Press Ctrl-C to cancel, or press Enter to continue:" -r -echo -e "\nNOTE: Spaces in your network name or password are ok. Do not add quotes." -read -p "Enter your network name: " -r -SSID=$REPLY -read -p "Enter your network password: " -r -PSK=$REPLY -cd /etc/network -cp interfaces interfaces.$(date +%s).bak -echo -e "auto lo\niface lo inet loopback\n\nauto usb0\niface usb0 inet static\n address 10.11.12.13\n netmask 255.255.255.0\n\nauto wlan0\niface wlan0 inet dhcp\n wpa-conf /etc/wpa_supplicant/wpa_supplicant.conf" > interfaces -echo -e "\n/etc/network/interfaces:\n" -cat interfaces -cd /etc/wpa_supplicant/ -cp wpa_supplicant.conf wpa_supplicant.conf.$(date +%s).bak -echo -e "ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=netdev\nupdate_config=1\nnetwork={\n ssid=\"$SSID\"\n psk=\"$PSK\"\n}" > wpa_supplicant.conf -echo -e "\n/etc/wpa_supplicant/wpa_supplicant.conf:\n" -cat wpa_supplicant.conf -echo -e "\nAttempting to bring up wlan0:\n" -ifdown wlan0; ifup wlan0 -echo -ne "\nWifi SSID: "; iwgetid -r -sleep 5 -# TODO check for options to fix the certificate activation error message for https -# TODO: change back to dev after merging nodejs-6 to dev, then to master after docs release -cd /tmp/; wget --no-check-certificate https://raw.githubusercontent.com/openaps/docs/nodejs-6/scripts/openaps-install.sh; bash ./openaps-install.sh -) From a775ca1869737839742fbd25ac4bfc8215eda772 Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Wed, 12 Jul 2017 22:19:15 -0700 Subject: [PATCH 05/14] nodejs-6 version of openaps-bootstrap.sh --- scripts/openaps-bootstrap.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/openaps-bootstrap.sh b/scripts/openaps-bootstrap.sh index d74b513d2..5546425fd 100644 --- a/scripts/openaps-bootstrap.sh +++ b/scripts/openaps-bootstrap.sh @@ -30,5 +30,6 @@ sleep 10 echo -ne "\nWifi SSID: "; iwgetid -r sleep 5 # TODO check for options to fix the certificate activation error message for https -cd /tmp/; wget --no-check-certificate https://raw.githubusercontent.com/openaps/docs/dev/scripts/openaps-install.sh; bash ./openaps-install.sh +# TODO: change back to dev after merging nodejs-6 to dev, then to master after docs release +cd /tmp/; wget --no-check-certificate https://raw.githubusercontent.com/openaps/docs/nodejs-6/scripts/openaps-install.sh; bash ./openaps-install.sh ) From 6b1c717b632dc39c2a3ebef7bd3879554614abd4 Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Wed, 12 Jul 2017 22:30:09 -0700 Subject: [PATCH 06/14] redirect npm output through cat to avoid ansi over console --- scripts/quick-packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/quick-packages.sh b/scripts/quick-packages.sh index e172094b3..6cc85f7d8 100644 --- a/scripts/quick-packages.sh +++ b/scripts/quick-packages.sh @@ -10,7 +10,7 @@ sudo pip install -U openaps && \ sudo pip install -U openaps-contrib && \ sudo openaps-install-udev-rules && \ sudo activate-global-python-argcomplete && \ -sudo npm install -g json oref0 && \ +sudo npm install -g json oref0 2>&1 | cat && \ echo openaps installed && \ openaps --version From bfc09f323c3a058a51b51bc3e54399965b4a51eb Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Wed, 12 Jul 2017 22:36:06 -0700 Subject: [PATCH 07/14] install mosh --- scripts/quick-packages.sh | 2 +- scripts/quick-src.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/quick-packages.sh b/scripts/quick-packages.sh index 6cc85f7d8..84280917a 100644 --- a/scripts/quick-packages.sh +++ b/scripts/quick-packages.sh @@ -5,7 +5,7 @@ apt-get -o Acquire::ForceIPv4=true install -y sudo sudo apt-get -o Acquire::ForceIPv4=true update && sudo apt-get -o Acquire::ForceIPv4=true -y upgrade # install nodejs 6.x instead of the old 0.10 that debian defaults to curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - -sudo apt-get -o Acquire::ForceIPv4=true install -y git python python-dev python-software-properties python-numpy python-pip nodejs npm watchdog strace tcpdump screen acpid vim locate jq lm-sensors && \ +sudo apt-get -o Acquire::ForceIPv4=true install -y git python python-dev python-software-properties python-numpy python-pip nodejs npm watchdog strace tcpdump screen acpid vim locate jq lm-sensors mosh && \ sudo pip install -U openaps && \ sudo pip install -U openaps-contrib && \ sudo openaps-install-udev-rules && \ diff --git a/scripts/quick-src.sh b/scripts/quick-src.sh index 85753e17c..43cccd0d6 100644 --- a/scripts/quick-src.sh +++ b/scripts/quick-src.sh @@ -2,7 +2,7 @@ apt-get install -y sudo sudo apt-get update -sudo apt-get install -y git python python-dev python-software-properties python-numpy python-pip nodejs-legacy npm watchdog strace tcpdump screen acpid vim locate jq lm-sensors && \ +sudo apt-get install -y git python python-dev python-software-properties python-numpy python-pip nodejs-legacy npm watchdog strace tcpdump screen acpid vim locate jq lm-sensors mosh && \ ( curl -s https://bootstrap.pypa.io/ez_setup.py | sudo python ) && \ sudo npm install -g json && \ sudo easy_install -ZU setuptools && \ From ca3443e8e3920f348c02a6e49517235a49e951f5 Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Wed, 12 Jul 2017 22:41:27 -0700 Subject: [PATCH 08/14] Revert "force IPv4 for now to make apt-get run at a reasonable speed" This reverts commit d71feb2afbc6434eff5ce981bb1c5d9c6bf27c8d. --- scripts/openaps-install.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/openaps-install.sh b/scripts/openaps-install.sh index 362e9c7be..2e728af03 100644 --- a/scripts/openaps-install.sh +++ b/scripts/openaps-install.sh @@ -15,9 +15,8 @@ passwd -S edison | grep 20[01][0-6] && passwd -e edison -i 3 dpkg-reconfigure tzdata #dpkg -P nodejs nodejs-dev -# TODO: remove the `-o Acquire::ForceIPv4=true` once Debian's mirrors work reliably over IPv6 -apt-get -o Acquire::ForceIPv4=true update && apt-get -o Acquire::ForceIPv4=true -y dist-upgrade && apt-get -o Acquire::ForceIPv4=true -y autoremove -apt-get -o Acquire::ForceIPv4=true install -y sudo strace tcpdump screen acpid vim python-pip locate +apt-get update && apt-get -y dist-upgrade && apt-get -y autoremove +apt-get install -y sudo strace tcpdump screen acpid vim python-pip locate adduser edison sudo adduser edison dialout From 1046b01afb6189afe9f41a3b858cd7e0fa89c816 Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Wed, 12 Jul 2017 22:42:52 -0700 Subject: [PATCH 09/14] let's do this systemwide instead --- scripts/quick-packages.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/scripts/quick-packages.sh b/scripts/quick-packages.sh index 84280917a..6159579cd 100644 --- a/scripts/quick-packages.sh +++ b/scripts/quick-packages.sh @@ -1,11 +1,10 @@ #!/bin/bash -# TODO: remove the `-o Acquire::ForceIPv4=true` once Debian's mirrors work reliably over IPv6 -apt-get -o Acquire::ForceIPv4=true install -y sudo -sudo apt-get -o Acquire::ForceIPv4=true update && sudo apt-get -o Acquire::ForceIPv4=true -y upgrade +apt-get install -y sudo +sudo apt-get update && sudo apt-get -y upgrade # install nodejs 6.x instead of the old 0.10 that debian defaults to curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - -sudo apt-get -o Acquire::ForceIPv4=true install -y git python python-dev python-software-properties python-numpy python-pip nodejs npm watchdog strace tcpdump screen acpid vim locate jq lm-sensors mosh && \ +sudo apt-get install -y git python python-dev python-software-properties python-numpy python-pip nodejs npm watchdog strace tcpdump screen acpid vim locate jq lm-sensors mosh && \ sudo pip install -U openaps && \ sudo pip install -U openaps-contrib && \ sudo openaps-install-udev-rules && \ From 68501b8caa468e3e4d9ee8dfd62d8cef34f0a759 Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Wed, 12 Jul 2017 22:43:47 -0700 Subject: [PATCH 10/14] force IPv4 for apt-get for now --- scripts/openaps-install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/openaps-install.sh b/scripts/openaps-install.sh index 2e728af03..7a5a2c11f 100644 --- a/scripts/openaps-install.sh +++ b/scripts/openaps-install.sh @@ -23,6 +23,9 @@ adduser edison dialout sed -i "s/daily/hourly/g" /etc/logrotate.conf sed -i "s/#compress/compress/g" /etc/logrotate.conf +# TODO: remove this after Debian's IPv6 mirrors are stable again +echo 'Acquire::ForceIPv4 "true";' | sudo tee /etc/apt/apt.conf.d/99force-ipv4 + # TODO: change back to dev after merging nodejs-6 to dev, then to master after docs release curl -s https://raw.githubusercontent.com/openaps/docs/nodejs-6/scripts/quick-packages.sh | bash - mkdir -p ~/src; cd ~/src && git clone git://github.com/openaps/oref0.git || (cd oref0 && git checkout master && git pull) From c25ebe27ee94078eb55644d6f4e2d9e5d7975094 Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Wed, 12 Jul 2017 23:03:41 -0700 Subject: [PATCH 11/14] try to resolve 'nodejs : Conflicts: npm' --- scripts/quick-packages.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/quick-packages.sh b/scripts/quick-packages.sh index 6159579cd..149da475f 100644 --- a/scripts/quick-packages.sh +++ b/scripts/quick-packages.sh @@ -4,7 +4,7 @@ apt-get install -y sudo sudo apt-get update && sudo apt-get -y upgrade # install nodejs 6.x instead of the old 0.10 that debian defaults to curl -sL https://deb.nodesource.com/setup_6.x | sudo -E bash - -sudo apt-get install -y git python python-dev python-software-properties python-numpy python-pip nodejs npm watchdog strace tcpdump screen acpid vim locate jq lm-sensors mosh && \ +sudo apt-get install -y git python python-dev python-software-properties python-numpy python-pip nodejs watchdog strace tcpdump screen acpid vim locate jq lm-sensors mosh && \ sudo pip install -U openaps && \ sudo pip install -U openaps-contrib && \ sudo openaps-install-udev-rules && \ From 6bdc0ada3e315b961eb8150b2c0cc44d5d77975e Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Wed, 12 Jul 2017 23:07:19 -0700 Subject: [PATCH 12/14] mkdir --- scripts/openaps-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/openaps-install.sh b/scripts/openaps-install.sh index 7a5a2c11f..c3827f206 100644 --- a/scripts/openaps-install.sh +++ b/scripts/openaps-install.sh @@ -24,6 +24,7 @@ sed -i "s/daily/hourly/g" /etc/logrotate.conf sed -i "s/#compress/compress/g" /etc/logrotate.conf # TODO: remove this after Debian's IPv6 mirrors are stable again +mkdir -p /etc/apt/apt.conf.d/ echo 'Acquire::ForceIPv4 "true";' | sudo tee /etc/apt/apt.conf.d/99force-ipv4 # TODO: change back to dev after merging nodejs-6 to dev, then to master after docs release From 48c17e45b3d580d43171ecc00db6863d15c21857 Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Thu, 13 Jul 2017 21:54:29 -0700 Subject: [PATCH 13/14] move ForceIPv4 above first apt-get call --- scripts/openaps-install.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/openaps-install.sh b/scripts/openaps-install.sh index c3827f206..bf46ee571 100644 --- a/scripts/openaps-install.sh +++ b/scripts/openaps-install.sh @@ -14,6 +14,10 @@ passwd -S edison | grep 20[01][0-6] && passwd -e edison -i 3 # set timezone dpkg-reconfigure tzdata +# TODO: remove this after Debian's IPv6 mirrors are stable again +mkdir -p /etc/apt/apt.conf.d/ +echo 'Acquire::ForceIPv4 "true";' | sudo tee /etc/apt/apt.conf.d/99force-ipv4 + #dpkg -P nodejs nodejs-dev apt-get update && apt-get -y dist-upgrade && apt-get -y autoremove apt-get install -y sudo strace tcpdump screen acpid vim python-pip locate @@ -23,10 +27,6 @@ adduser edison dialout sed -i "s/daily/hourly/g" /etc/logrotate.conf sed -i "s/#compress/compress/g" /etc/logrotate.conf -# TODO: remove this after Debian's IPv6 mirrors are stable again -mkdir -p /etc/apt/apt.conf.d/ -echo 'Acquire::ForceIPv4 "true";' | sudo tee /etc/apt/apt.conf.d/99force-ipv4 - # TODO: change back to dev after merging nodejs-6 to dev, then to master after docs release curl -s https://raw.githubusercontent.com/openaps/docs/nodejs-6/scripts/quick-packages.sh | bash - mkdir -p ~/src; cd ~/src && git clone git://github.com/openaps/oref0.git || (cd oref0 && git checkout master && git pull) From c8900f7c9633862634e862b68601f4b12fcbfd0d Mon Sep 17 00:00:00 2001 From: Scott Leibrand Date: Thu, 13 Jul 2017 21:57:52 -0700 Subject: [PATCH 14/14] no sudo yet --- scripts/openaps-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/openaps-install.sh b/scripts/openaps-install.sh index bf46ee571..7016517ca 100644 --- a/scripts/openaps-install.sh +++ b/scripts/openaps-install.sh @@ -16,7 +16,7 @@ dpkg-reconfigure tzdata # TODO: remove this after Debian's IPv6 mirrors are stable again mkdir -p /etc/apt/apt.conf.d/ -echo 'Acquire::ForceIPv4 "true";' | sudo tee /etc/apt/apt.conf.d/99force-ipv4 +echo 'Acquire::ForceIPv4 "true";' | tee /etc/apt/apt.conf.d/99force-ipv4 #dpkg -P nodejs nodejs-dev apt-get update && apt-get -y dist-upgrade && apt-get -y autoremove