diff --git a/builder/image-init.sh b/builder/image-init.sh index 1afd5381..7b66d961 100755 --- a/builder/image-init.sh +++ b/builder/image-init.sh @@ -1,16 +1,18 @@ #! /usr/bin/env bash # -# Script for image configure -# @urpylka Artem Smirnov +# Script for initialisation image +# +# Copyright (C) 2018 Copter Express Technologies +# +# Author: Artem Smirnov +# +# Distributed under MIT License (available at https://opensource.org/licenses/MIT). +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. # -# Exit immidiately on non-zero result -set -e - -################################################################################################################################## -# Image initialisation -################################################################################################################################## +set -e # Exit immidiately on non-zero result echo_stamp() { # TEMPLATE: echo_stamp @@ -32,24 +34,6 @@ echo_stamp() { echo -e ${TEXT} } -echo_stamp "Install apt keys & repos" - -# TODO: This STDOUT consist 'OK' -curl http://repo.coex.space/aptly_repo_signing.key 2> /dev/null | apt-key add - -apt-get update \ - && apt-get install --no-install-recommends -y -qq dirmngr=2.1.18-8~deb9u2 > /dev/null \ - && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116 - -echo "deb http://packages.ros.org/ros/ubuntu stretch main" > /etc/apt/sources.list.d/ros-latest.list -echo "deb http://repo.coex.space/rpi-ros-kinetic stretch main" > /etc/apt/sources.list.d/rpi-ros-kinetic.list -echo "deb http://repo.coex.space/clever stretch main" > /etc/apt/sources.list.d/clever.list - -echo_stamp "Update apt cache" - -# TODO: FIX ERROR: /usr/bin/apt-key: 596: /usr/bin/apt-key: cannot create /dev/null: Permission denied -apt-get update -qq > /dev/null -# && apt upgrade -y - echo_stamp "Write CLEVER information" # Clever image version diff --git a/builder/image-network.sh b/builder/image-network.sh index 71aea1c5..cdb575ed 100755 --- a/builder/image-network.sh +++ b/builder/image-network.sh @@ -1,12 +1,18 @@ #! /usr/bin/env bash # -# Script for image configure -# @urpylka Artem Smirnov +# Script for network configure +# +# Copyright (C) 2018 Copter Express Technologies +# +# Author: Artem Smirnov +# +# Distributed under MIT License (available at https://opensource.org/licenses/MIT). +# The above copyright notice and this permission notice shall be included in all +# copies or substantial portions of the Software. # -# Exit immidiately on non-zero result -set -e +set -e # Exit immidiately on non-zero result echo_stamp() { # TEMPLATE: echo_stamp @@ -31,7 +37,7 @@ echo_stamp() { echo_stamp "#1 Write to /etc/wpa_supplicant/wpa_supplicant.conf" # TODO: Use wpa_cli insted direct file edit -echo " +cat << EOF >> /etc/wpa_supplicant/wpa_supplicant.conf network={ ssid=\"CLEVER\" psk=\"cleverwifi\" @@ -41,17 +47,19 @@ network={ pairwise=CCMP group=CCMP auth_alg=OPEN -}" >> /etc/wpa_supplicant/wpa_supplicant.conf +} +EOF echo_stamp "#2 Write STATIC to /etc/dhcpcd.conf" -echo " +cat << EOF >> /etc/dhcpcd.conf interface wlan0 -static ip_address=192.168.11.1/24" >> /etc/dhcpcd.conf +static ip_address=192.168.11.1/24 +EOF echo_stamp "#3 Write dhcp-config to /etc/dnsmasq.conf" -echo " +cat << EOF >> /etc/dnsmasq.conf interface=wlan0 address=/clever/coex/192.168.11.1 dhcp-range=192.168.11.100,192.168.11.200,12h @@ -60,7 +68,7 @@ filterwin2k bogus-priv domain-needed quiet-dhcp6 -" >> /etc/dnsmasq.conf +EOF #echo_stamp "#4 Write magic script for rename SSID to /etc/rc.local" #RENAME_SSID="sudo sed -i.OLD \"s/CLEVER/CLEVER-\$(head -c 100 /dev/urandom | xxd -ps -c 100 | sed -e 's/[^0-9]//g' | cut -c 1-4)/g\" /etc/wpa_supplicant/wpa_supplicant.conf && sudo sed -i '/sudo sed/d' /etc/rc.local && sudo reboot" diff --git a/builder/image-software.sh b/builder/image-software.sh index 92aca5fe..b3c4b754 100755 --- a/builder/image-software.sh +++ b/builder/image-software.sh @@ -34,6 +34,24 @@ echo_stamp() { echo -e ${TEXT} } +echo_stamp "Install apt keys & repos" + +# TODO: This STDOUT consist 'OK' +curl http://repo.coex.space/aptly_repo_signing.key 2> /dev/null | apt-key add - +apt-get update \ + && apt-get install --no-install-recommends -y -qq dirmngr=2.1.18-8~deb9u2 > /dev/null \ + && apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-key 421C365BD9FF1F717815A3895523BAEEB01FA116 + +echo "deb http://packages.ros.org/ros/ubuntu stretch main" > /etc/apt/sources.list.d/ros-latest.list +echo "deb http://repo.coex.space/rpi-ros-kinetic stretch main" > /etc/apt/sources.list.d/rpi-ros-kinetic.list +echo "deb http://repo.coex.space/clever stretch main" > /etc/apt/sources.list.d/clever.list + +echo_stamp "Update apt cache" + +# TODO: FIX ERROR: /usr/bin/apt-key: 596: /usr/bin/apt-key: cannot create /dev/null: Permission denied +apt-get update -qq > /dev/null +# && apt upgrade -y + echo_stamp "Software installing" apt-get install --no-install-recommends -y \ unzip=6.0-21 \