From d7e54487f436adae4980ecced40b25a1164781f9 Mon Sep 17 00:00:00 2001 From: AnotherDroog <36770425+AnotherDroog@users.noreply.github.com> Date: Tue, 30 Apr 2019 16:51:19 +0700 Subject: [PATCH] shfmt -p (reformat in posix mode) --- home/lncm/box-install.sh | 256 +++++++++++++++++------------------ home/lncm/box-postinstall.sh | 128 +++++++++--------- make_cache.sh | 30 ++-- make_container.sh | 20 +-- make_img.sh | 116 ++++++++-------- make_modloop.sh | 16 +-- make_upgrade.sh | 64 ++++----- 7 files changed, 315 insertions(+), 315 deletions(-) diff --git a/home/lncm/box-install.sh b/home/lncm/box-install.sh index 787b372a..6423b99e 100755 --- a/home/lncm/box-install.sh +++ b/home/lncm/box-install.sh @@ -16,191 +16,191 @@ SD=mmcblk0 START=268M check_installed() { - if [ -f /media/${SD}p1/installed ]; then - # installed - echo 0 - return 0 - else - # not installed - echo 1 - return 1 - fi + if [ -f /media/${SD}p1/installed ]; then + # installed + echo 0 + return 0 + else + # not installed + echo 1 + return 1 + fi } install_apk() { - echo "Install $1" - while [ -z "$( apk -e info $1 )" ]; do - /sbin/apk add $1 - done + echo "Install $1" + while [ -z "$(apk -e info $1)" ]; do + /sbin/apk add $1 + done } mnt_rw() { - echo "Re-mount FAT partition read/write" - /bin/mount -o remount,rw /dev/"${SD}"p1 /media/"${SD}"p1 + echo "Re-mount FAT partition read/write" + /bin/mount -o remount,rw /dev/"${SD}"p1 /media/"${SD}"p1 } mnt_ro() { - echo "Re-mount FAT partition read-only" - /bin/mount -o remount,ro /dev/"${SD}p1" /media/"${SD}"p1 + echo "Re-mount FAT partition read-only" + /bin/mount -o remount,ro /dev/"${SD}p1" /media/"${SD}"p1 } install_tools() { - echo "Add partitioning and filesystem tools" - /sbin/setup-apkcache /media/mmcblk0p1/cache - install_apk parted - install_apk e2fsprogs + echo "Add partitioning and filesystem tools" + /sbin/setup-apkcache /media/mmcblk0p1/cache + install_apk parted + install_apk e2fsprogs } partition_sd() { - echo "Create second primary partition" - /usr/sbin/parted -s /dev/$SD mkpart p ext4 $START 100% + echo "Create second primary partition" + /usr/sbin/parted -s /dev/$SD mkpart p ext4 $START 100% } create_ext4() { - echo "Create and mount ext4 filesystem" - /sbin/mkfs.ext4 -F /dev/${SD}p2 && \ - /bin/echo "/dev/${SD}p2 /media/sd ext4 noatime 0 0" >> /etc/fstab && \ - /bin/mkdir /media/sd && \ - /bin/mount /media/sd + echo "Create and mount ext4 filesystem" + /sbin/mkfs.ext4 -F /dev/${SD}p2 && + /bin/echo "/dev/${SD}p2 /media/sd ext4 noatime 0 0" >>/etc/fstab && + /bin/mkdir /media/sd && + /bin/mount /media/sd } check_mounted() { - echo "Check if ext4 partition on SD is mounted" - if [ ! -d /media/sd/lost+found ]; then - echo "Error: ${SD}p2 partition doesn't seem to be mounted" - exit 1 - fi + echo "Check if ext4 partition on SD is mounted" + if [ ! -d /media/sd/lost+found ]; then + echo "Error: ${SD}p2 partition doesn't seem to be mounted" + exit 1 + fi } persist_state() { - echo "Persist state to apkovl" - /sbin/lbu package /media/"${SD}"p1/"${APK}" || exit + echo "Persist state to apkovl" + /sbin/lbu package /media/"${SD}"p1/"${APK}" || exit } install_sd() { - echo "Install to /media/sd and apply apkovl" && \ - /sbin/setup-disk -o /media/mmcblk0p1/box.apkovl.tar.gz /media/sd || exit - if [ ! -d /media/sd/etc ]; then - echo "Setup disk did not seem to create anything! Exiting" - exit 1 - fi + echo "Install to /media/sd and apply apkovl" && + /sbin/setup-disk -o /media/mmcblk0p1/box.apkovl.tar.gz /media/sd || exit + if [ ! -d /media/sd/etc ]; then + echo "Setup disk did not seem to create anything! Exiting" + exit 1 + fi } add_fat() { - echo "Add FAT partition to new fstab" - /bin/echo "/dev/mmcblk0p1 /media/mmcblk0p1 vfat defaults 0 0" >> /media/sd/etc/fstab + echo "Add FAT partition to new fstab" + /bin/echo "/dev/mmcblk0p1 /media/mmcblk0p1 vfat defaults 0 0" >>/media/sd/etc/fstab } clean_devs() { - echo "Remove unused devices and mountpoints" - /bin/sed -i '/cdrom/d' /media/sd/etc/fstab && \ - /bin/rmdir /media/sd/media/cdrom - /bin/sed -i '/usbdisk/d' /media/sd/etc/fstab && \ - /bin/rmdir /media/sd/media/usb - /bin/rmdir /media/sd/media/floppy + echo "Remove unused devices and mountpoints" + /bin/sed -i '/cdrom/d' /media/sd/etc/fstab && + /bin/rmdir /media/sd/media/cdrom + /bin/sed -i '/usbdisk/d' /media/sd/etc/fstab && + /bin/rmdir /media/sd/media/usb + /bin/rmdir /media/sd/media/floppy } setup_user() { - echo "Create lncm home dir if necessary" - /bin/mkdir -p /media/sd/home/lncm - echo "Set user permissions" - /bin/chown lncm:lncm /media/sd/home/lncm + echo "Create lncm home dir if necessary" + /bin/mkdir -p /media/sd/home/lncm + echo "Set user permissions" + /bin/chown lncm:lncm /media/sd/home/lncm } install_boot() { - # Boot installation - echo "Re-mount FAT partition read/write" - /bin/mount -o remount,rw /dev/${SD}p1 /media/${SD}p1 && \ - echo "Prepend root partition to boot command" && \ - /bin/sed -e 's/^/root=\/dev\/mmcblk0p2 /' -i /media/${SD}p1/cmdline.txt && \ - echo "Backup old boot files" && \ - /bin/mkdir /media/mmcblk0p1/boot_backup && \ - /bin/mv /media/mmcblk0p1/boot/* /media/mmcblk0p1/boot_backup/ - - if [ -d /media/sd/boot ]; then - echo "Remove old boot files on fat partition" && \ - /bin/rm -rf /media/mmcblk0p1/boot/* && \ - /bin/rm /media/sd/boot/boot && \ - echo "Copy new boot files to fat partition" && \ - /bin/cp /media/sd/boot/* /media/mmcblk0p1/boot/ && \ - echo "Delete new boot dir" && \ - /bin/rm -rf /media/sd/boot && \ - echo "Link boot to fat partition" && \ - cd /media/sd && \ - /bin/ln -s /media/mmcblk0p1 boot - else - echo "Error: boot directory on ${SD}p2 missing" - exit 1 - fi + # Boot installation + echo "Re-mount FAT partition read/write" + /bin/mount -o remount,rw /dev/${SD}p1 /media/${SD}p1 && + echo "Prepend root partition to boot command" && + /bin/sed -e 's/^/root=\/dev\/mmcblk0p2 /' -i /media/${SD}p1/cmdline.txt && + echo "Backup old boot files" && + /bin/mkdir /media/mmcblk0p1/boot_backup && + /bin/mv /media/mmcblk0p1/boot/* /media/mmcblk0p1/boot_backup/ + + if [ -d /media/sd/boot ]; then + echo "Remove old boot files on fat partition" && + /bin/rm -rf /media/mmcblk0p1/boot/* && + /bin/rm /media/sd/boot/boot && + echo "Copy new boot files to fat partition" && + /bin/cp /media/sd/boot/* /media/mmcblk0p1/boot/ && + echo "Delete new boot dir" && + /bin/rm -rf /media/sd/boot && + echo "Link boot to fat partition" && + cd /media/sd && + /bin/ln -s /media/mmcblk0p1 boot + else + echo "Error: boot directory on ${SD}p2 missing" + exit 1 + fi } mark_sd() { - echo "Mark SD card with installed version" - /bin/echo "$VER" > /media/${SD}p1/installed - /bin/echo "Copying rc.log to persistent store for debugging" - /bin/cp /var/log/rc.log /media/${SD}p1 + echo "Mark SD card with installed version" + /bin/echo "$VER" >/media/${SD}p1/installed + /bin/echo "Copying rc.log to persistent store for debugging" + /bin/cp /var/log/rc.log /media/${SD}p1 } create_swap() { - echo "Create and install swap file" - /bin/dd if=/dev/zero of=/media/sd/var/cache/swap bs=1M count=1024 && \ - /bin/chown 600 /media/sd/var/cache/swap && \ - /sbin/mkswap /media/sd/var/cache/swap && \ - /sbin/swapon /media/sd/var/cache/swap && \ - /bin/echo "/var/cache/swap none swap sw,pri=10 0 0" >> /media/sd/etc/fstab && \ - echo "Enable swap at boot" - cd /media/sd/etc/runlevels/boot || exit - /bin/ln -s /etc/init.d/swap swap + echo "Create and install swap file" + /bin/dd if=/dev/zero of=/media/sd/var/cache/swap bs=1M count=1024 && + /bin/chown 600 /media/sd/var/cache/swap && + /sbin/mkswap /media/sd/var/cache/swap && + /sbin/swapon /media/sd/var/cache/swap && + /bin/echo "/var/cache/swap none swap sw,pri=10 0 0" >>/media/sd/etc/fstab && + echo "Enable swap at boot" + cd /media/sd/etc/runlevels/boot || exit + /bin/ln -s /etc/init.d/swap swap } enable_post() { - echo "Enable post-installation script at boot" - cd /media/sd/etc/runlevels/default || exit - /bin/ln -s /etc/init.d/lncm-post lncm-post + echo "Enable post-installation script at boot" + cd /media/sd/etc/runlevels/default || exit + /bin/ln -s /etc/init.d/lncm-post lncm-post } disable_install() { - echo "Deactivate LNCM installation script" - /sbin/rc-update del lncm default || exit - /bin/rm /media/sd/etc/runlevels/default/lncm || exit + echo "Deactivate LNCM installation script" + /sbin/rc-update del lncm default || exit + /bin/rm /media/sd/etc/runlevels/default/lncm || exit } reboot_now() { - echo "Rebooting..." - /sbin/reboot + echo "Rebooting..." + /sbin/reboot } main() { - is_installed=$(check_installed) - - if [ "$is_installed" -eq "0" ]; then - echo "Already installed, skipping." - exit 1 - fi - - install_tools - partition_sd - create_ext4 - check_mounted - mnt_rw - persist_state - install_sd - add_fat - clean_devs - setup_user - install_boot - mark_sd - #create_swap # disable sd card swap - enable_post - disable_install - persist_state - mnt_ro - - is_installed=$(check_installed) - - if [ "${is_installed}" -eq "0" ]; then - reboot_now - fi + is_installed=$(check_installed) + + if [ "$is_installed" -eq "0" ]; then + echo "Already installed, skipping." + exit 1 + fi + + install_tools + partition_sd + create_ext4 + check_mounted + mnt_rw + persist_state + install_sd + add_fat + clean_devs + setup_user + install_boot + mark_sd + #create_swap # disable sd card swap + enable_post + disable_install + persist_state + mnt_ro + + is_installed=$(check_installed) + + if [ "${is_installed}" -eq "0" ]; then + reboot_now + fi } main diff --git a/home/lncm/box-postinstall.sh b/home/lncm/box-postinstall.sh index 1981e9d4..49a44706 100755 --- a/home/lncm/box-postinstall.sh +++ b/home/lncm/box-postinstall.sh @@ -8,106 +8,106 @@ REQUIREMENTS_URL=https://raw.githubusercontent.com/lncm/noma/master/requirements.txt is_installed() { - if [ -f /media/mmcblk0p1/installed ]; then - return 0 - else - return 1 - fi + if [ -f /media/mmcblk0p1/installed ]; then + return 0 + else + return 1 + fi } update_pip_pkg() { - echo "Update python package $1" - while ! [ "$(/usr/bin/pip3 install --upgrade $1)" ]; do - update_pip_pkg $1 - done + echo "Update python package $1" + while ! [ "$(/usr/bin/pip3 install --upgrade $1)" ]; do + update_pip_pkg $1 + done } install_apk() { - echo "Install $1" - while [ -z "$( apk -e info $1 )" ]; do - /sbin/apk add $1 - done + echo "Install $1" + while [ -z "$(apk -e info $1)" ]; do + /sbin/apk add $1 + done } install_noma_requirements() { - echo "Install noma requirements" - if [ "$(/usr/bin/pip3 install -r $REQUIREMENTS_URL)" ]; then - echo "Requirements installed successfully" - else - install_noma_requirements - fi + echo "Install noma requirements" + if [ "$(/usr/bin/pip3 install -r $REQUIREMENTS_URL)" ]; then + echo "Requirements installed successfully" + else + install_noma_requirements + fi } install_python() { - install_apk python3 + install_apk python3 } install_apk_deps() { - echo "Install misc dependencies" - install_apk py3-psutil + echo "Install misc dependencies" + install_apk py3-psutil } install_pip() { - echo "Install and upgrade pip" - update_pip_pkg pip + echo "Install and upgrade pip" + update_pip_pkg pip } install_pip_pkg() { - echo "Install python package $1" - while [ -z "$(/usr/bin/pip3 show $1)" ]; do - /usr/bin/pip3 install $1 - done + echo "Install python package $1" + while [ -z "$(/usr/bin/pip3 show $1)" ]; do + /usr/bin/pip3 install $1 + done } build_noma() { - echo "Building noma - node management tools from source" - install_apk gcc - install_apk python3-dev - install_apk linux-headers - install_apk py-configobj - install_apk libusb - install_apk python-dev - install_apk musl-dev - /usr/bin/wget https://github.com/lncm/noma/archive/master.zip - /usr/bin/unzip master.zip - /usr/bin/pip3 install -r https://raw.githubusercontent.com/lncm/noma/master/requirements.txt - install_pip_pkg wheel - cd noma-master - /usr/bin/python3 setup.py bdist_wheel - /usr/bin/pip3 install dist/noma-*.whl + echo "Building noma - node management tools from source" + install_apk gcc + install_apk python3-dev + install_apk linux-headers + install_apk py-configobj + install_apk libusb + install_apk python-dev + install_apk musl-dev + /usr/bin/wget https://github.com/lncm/noma/archive/master.zip + /usr/bin/unzip master.zip + /usr/bin/pip3 install -r https://raw.githubusercontent.com/lncm/noma/master/requirements.txt + install_pip_pkg wheel + cd noma-master + /usr/bin/python3 setup.py bdist_wheel + /usr/bin/pip3 install dist/noma-*.whl } install_python_deps() { - echo "Install python dependencies" - install_pip_pkg docker + echo "Install python dependencies" + install_pip_pkg docker } install_noma() { - echo "Install noma - node management tool" - while [ -z "$(/usr/bin/pip3 show noma)" ]; do - /usr/bin/pip3 install noma - done + echo "Install noma - node management tool" + while [ -z "$(/usr/bin/pip3 show noma)" ]; do + /usr/bin/pip3 install noma + done } run_noma() { - echo "Running noma box-install" - /usr/bin/noma install-box > /var/log/noma.log 2>&1 & + echo "Running noma box-install" + /usr/bin/noma install-box >/var/log/noma.log 2>&1 & } main() { - if ! is_installed; then - echo "Error: LNCM installation not found!" - exit 1 - fi - - install_python - #install_python_deps - install_apk_deps - install_pip - #install_noma_requirements - install_noma - #build_noma - run_noma + if ! is_installed; then + echo "Error: LNCM installation not found!" + exit 1 + fi + + install_python + #install_python_deps + install_apk_deps + install_pip + #install_noma_requirements + install_noma + #build_noma + run_noma } main diff --git a/make_cache.sh b/make_cache.sh index 47df0787..5f316367 100755 --- a/make_cache.sh +++ b/make_cache.sh @@ -12,13 +12,13 @@ WORKDIR=/home/lncm/pi-factory/lncm-workdir OUTPUT=cache.tar.gz cmd_exists() { - $(command -v ${1} 2>&1 1>/dev/null;) - echo $? + $(command -v ${1} 2>&1 1>/dev/null) + echo $? } -if [ ! "$(cmd_exists apk)" -eq "0" ]; then - echo "Not an Alpine-based system, aborting" - exit 1 +if [ ! "$(cmd_exists apk)" -eq "0" ]; then + echo "Not an Alpine-based system, aborting" + exit 1 fi mkdir -p ${WORKDIR} @@ -37,13 +37,13 @@ echo "Making backup of ${WORLD}" cp -v ${WORLD} ${WORLD}.backup echo "Creating new minimal ${WORLD}" -echo -e "alpine-base" > ${WORLD} -echo -e "avahi" >> ${WORLD} -echo -e "dbus" >> ${WORLD} -echo -e "docker" >> ${WORLD} -echo -e "openssh" >> ${WORLD} -echo -e "wireless-tools" >> ${WORLD} -echo -e "wpa_supplicant" >> ${WORLD} +echo -e "alpine-base" >${WORLD} +echo -e "avahi" >>${WORLD} +echo -e "dbus" >>${WORLD} +echo -e "docker" >>${WORLD} +echo -e "openssh" >>${WORLD} +echo -e "wireless-tools" >>${WORLD} +echo -e "wpa_supplicant" >>${WORLD} mkdir -p ${WORKDIR}/cache @@ -51,8 +51,8 @@ echo "Setting apk cache to ${WORKDIR}/cache" setup-apkcache ${WORKDIR}/cache echo "Syncing cache" -apk update && \ -apk cache sync -v --no-cache +apk update && + apk cache sync -v --no-cache # Disables adding resource-forks on MacOS export COPYFILE_DISABLE=true @@ -68,4 +68,4 @@ echo "Restoring previous ${WORLD}" cp ${WORLD}.backup ${WORLD} echo "Restoring previous apk cache location" -setup-apkcache ${NORMAL_LOCATION} \ No newline at end of file +setup-apkcache ${NORMAL_LOCATION} diff --git a/make_container.sh b/make_container.sh index 1e3da29b..a5c7d7c5 100755 --- a/make_container.sh +++ b/make_container.sh @@ -3,17 +3,17 @@ # Creates containers for docker from a running system with relevant docker images get_id() { - docker ps -aqf "name=${1}" + docker ps -aqf "name=${1}" } cmd_exists() { - $(command -v ${1} 2>&1 1>/dev/null;) - echo $? + $(command -v ${1} 2>&1 1>/dev/null) + echo $? } -if [ ! "$(cmd_exists docker)" -eq "0" ]; then - echo "Docker not found, aborting" - exit 1 +if [ ! "$(cmd_exists docker)" -eq "0" ]; then + echo "Docker not found, aborting" + exit 1 fi iotwifi_ID=$(get_id iotwifi) @@ -23,17 +23,17 @@ export iotwifi_ID export nginx_ID save_container() { - docker save -o "${1}".tar.gz "${2}" + docker save -o "${1}".tar.gz "${2}" } if [ ! -d lncm-workdir ]; then - mkdir lncm-workdir + mkdir lncm-workdir fi cd lncm-workdir || exit if [ ! -d output ]; then - mkdir output + mkdir output fi save_container output/iotwifi cjimti/iotwifi @@ -42,4 +42,4 @@ save_container output/nginx nginx cd output || exit tar cvzf ../iotwifi.tar.gz iotwifi.tar.gz -tar cvzf ../nginx.tar.gz nginx.tar.gz \ No newline at end of file +tar cvzf ../nginx.tar.gz nginx.tar.gz diff --git a/make_img.sh b/make_img.sh index bd5e7836..6e58624a 100755 --- a/make_img.sh +++ b/make_img.sh @@ -16,32 +16,32 @@ CACHE=cache.tar.gz MNT=/mnt/lncm if [ "$(id -u)" -ne "0" ]; then - echo "This script must be run as root" - exit 1 + echo "This script must be run as root" + exit 1 fi cmd_exists() { - $(command -v ${1} 2>&1 1>/dev/null;) - ret=$? - echo $ret - return $ret + $(command -v ${1} 2>&1 1>/dev/null) + ret=$? + echo $ret + return $ret } -if [ "$(cmd_exists apk)" -eq "0" ]; then - echo "Found Alpine-based system, installing dependencies" - apk add parted zip unzip +if [ "$(cmd_exists apk)" -eq "0" ]; then + echo "Found Alpine-based system, installing dependencies" + apk add parted zip unzip fi if [ "$(cmd_exists apt-get)" -eq "0" ]; then - echo "Found Debian-based system, installing dependencies" - apt-get install -y parted zip unzip + echo "Found Debian-based system, installing dependencies" + apt-get install -y parted zip unzip fi check_deps() { - cmd_exists parted >/dev/null || exit 1 - cmd_exists zip >/dev/null || exit 1 - cmd_exists unzip >/dev/null || exit 1 - echo "Found required dependencies" + cmd_exists parted >/dev/null || exit 1 + cmd_exists zip >/dev/null || exit 1 + cmd_exists unzip >/dev/null || exit 1 + echo "Found required dependencies" } echo "Building ${IMG}" @@ -49,93 +49,93 @@ echo "Using ${ALP} as base distribution" echo 'Check for existing wpa_supplicant.automatic.conf' if [ -f ./wpa_supplicant.automatic.conf ]; then - echo "WPA supplicant automatic file exists, bootstrapping the network configuration" - cp ./etc/wpa_supplicant/wpa_supplicant.conf ./etc/wpa_supplicant/wpa_supplicant.conf.bak - cp ./wpa_supplicant.automatic.conf etc/wpa_supplicant/wpa_supplicant.conf + echo "WPA supplicant automatic file exists, bootstrapping the network configuration" + cp ./etc/wpa_supplicant/wpa_supplicant.conf ./etc/wpa_supplicant/wpa_supplicant.conf.bak + cp ./wpa_supplicant.automatic.conf etc/wpa_supplicant/wpa_supplicant.conf fi echo 'Check for authorized_keys.automatic' if [ -f ./authorized_keys.automatic ]; then - echo "Authorized keys file exists, bootstrapping the ssh authorized keys file" - if [ ! -d ./home/lncm/.ssh ]; then - mkdir -p ./home/lncm/.ssh - fi - cp ./authorized_keys.automatic ./home/lncm/.ssh/authorized_keys - echo "Reconfiguring SSHD to not allow for passwords" - cp ./etc/ssh/sshd_config ./etc/ssh/sshd_config.bak - sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/' ./etc/ssh/sshd_config + echo "Authorized keys file exists, bootstrapping the ssh authorized keys file" + if [ ! -d ./home/lncm/.ssh ]; then + mkdir -p ./home/lncm/.ssh + fi + cp ./authorized_keys.automatic ./home/lncm/.ssh/authorized_keys + echo "Reconfiguring SSHD to not allow for passwords" + cp ./etc/ssh/sshd_config ./etc/ssh/sshd_config.bak + sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/' ./etc/ssh/sshd_config fi echo 'Generate fresh box.apkovl.tar.gz from source' sh make_apkovl.sh # Cleanup files we created if [ -f ./etc/wpa_supplicant/wpa_supplicant.conf.bak ]; then - echo 'Restore old WPA Supplicant after making apkovl (and deleting the backup file)' - cp ./etc/wpa_supplicant/wpa_supplicant.conf.bak ./etc/wpa_supplicant/wpa_supplicant.conf - rm ./etc/wpa_supplicant/wpa_supplicant.conf.bak + echo 'Restore old WPA Supplicant after making apkovl (and deleting the backup file)' + cp ./etc/wpa_supplicant/wpa_supplicant.conf.bak ./etc/wpa_supplicant/wpa_supplicant.conf + rm ./etc/wpa_supplicant/wpa_supplicant.conf.bak fi fetch_wifi() { - echo "Checking for wifi manager" - mkdir -p home/lncm/public_html/wifi - if [ ! -f home/lncm/public_html/wifi/index.html ]; then - echo "Fetch wifi manager" - wget -O home/lncm/public_html/wifi/index.html --no-verbose \ - https://raw.githubusercontent.com/lncm/iotwifi-ui/master/dist/index.html || exit - fi + echo "Checking for wifi manager" + mkdir -p home/lncm/public_html/wifi + if [ ! -f home/lncm/public_html/wifi/index.html ]; then + echo "Fetch wifi manager" + wget -O home/lncm/public_html/wifi/index.html --no-verbose \ + https://raw.githubusercontent.com/lncm/iotwifi-ui/master/dist/index.html || exit + fi } fetch_wifi # Cleanup authorized_keys if [ -d ./home/lncm/.ssh ]; then - echo "Remove .ssh directory" - rm -fr ./home/lncm/.ssh + echo "Remove .ssh directory" + rm -fr ./home/lncm/.ssh fi if [ -f ./etc/ssh/sshd_config.bak ]; then - echo "Restoring sshd_config to be equal with last commit" - cp ./etc/ssh/sshd_config.bak ./etc/ssh/sshd_config - rm ./etc/ssh/sshd_config.bak + echo "Restoring sshd_config to be equal with last commit" + cp ./etc/ssh/sshd_config.bak ./etc/ssh/sshd_config + rm ./etc/ssh/sshd_config.bak fi mkdir -p lncm-workdir cd lncm-workdir || exit if ! [ -f ${ALP} ]; then - echo "${ALP} not found, fetching..." - wget --no-verbose http://dl-cdn.alpinelinux.org/alpine/${REL}/releases/armhf/${ALP} + echo "${ALP} not found, fetching..." + wget --no-verbose http://dl-cdn.alpinelinux.org/alpine/${REL}/releases/armhf/${ALP} fi if ! [ -f ${IOT} ]; then - echo "${IOT} not found, fetching..." - wget --no-verbose https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${IOT} + echo "${IOT} not found, fetching..." + wget --no-verbose https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${IOT} fi if ! [ -f ${FIX} ]; then - echo "${FIX} not found, fetching..." - wget --no-verbose https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${FIX} + echo "${FIX} not found, fetching..." + wget --no-verbose https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${FIX} fi if ! [ -f ${CACHE} ]; then - echo "${CACHE} not found, fetching..." - wget --no-verbose https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${CACHE} + echo "${CACHE} not found, fetching..." + wget --no-verbose https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${CACHE} fi if ! [ -f ${NGINX} ]; then - echo "${NGINX} not found, fetching..." - wget --no-verbose https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${NGINX} + echo "${NGINX} not found, fetching..." + wget --no-verbose https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${NGINX} fi echo "Create and mount 256MB image" -dd if=/dev/zero of=${IMG} bs=1M count=256 && \ - DEV=$(losetup -f) && \ - losetup -f ${IMG} && \ - echo "Create 256MB FAT32 partition and filesystem" && \ - parted -s "${DEV}" mklabel msdos mkpart p fat32 2048s 100% set 1 boot on && \ - mkfs.vfat "${DEV}"p1 -IF 32 +dd if=/dev/zero of=${IMG} bs=1M count=256 && + DEV=$(losetup -f) && + losetup -f ${IMG} && + echo "Create 256MB FAT32 partition and filesystem" && + parted -s "${DEV}" mklabel msdos mkpart p fat32 2048s 100% set 1 boot on && + mkfs.vfat "${DEV}"p1 -IF 32 if ! [ -d ${MNT} ]; then - mkdir ${MNT} + mkdir ${MNT} fi echo "Mount FAT partition" diff --git a/make_modloop.sh b/make_modloop.sh index 2c709ded..bc366698 100755 --- a/make_modloop.sh +++ b/make_modloop.sh @@ -16,29 +16,29 @@ mkdir -p ${WORKDIR} cd ${WORKDIR} || exit if [ ! -f ${FIRMWARE} ]; then - echo "brcm firmware not found, fetching..." - wget $FIRMWARE_URL/$FIRMWARE + echo "brcm firmware not found, fetching..." + wget $FIRMWARE_URL/$FIRMWARE fi cmd_exists() { - $(command -v ${1} 2>&1 1>/dev/null;) - echo $? + $(command -v ${1} 2>&1 1>/dev/null) + echo $? } if [ "$(cmd_exists apk)" -eq "0" ]; then - apk update && apk add squashfs-tools unzip + apk update && apk add squashfs-tools unzip fi if [ "$(cmd_exists apt)" -eq "0" ]; then - apt update && apt install squashfs-tools unzip + apt update && apt install squashfs-tools unzip fi rm -rf brcmfmac* unzip brcm-firmware.zip if ! [ -f ${ALP} ]; then - echo "${ALP} not found, fetching..." - wget http://dl-cdn.alpinelinux.org/alpine/${REL}/releases/armhf/${ALP} + echo "${ALP} not found, fetching..." + wget http://dl-cdn.alpinelinux.org/alpine/${REL}/releases/armhf/${ALP} fi rm -rf alp-distro diff --git a/make_upgrade.sh b/make_upgrade.sh index 852b2f80..b9bad036 100755 --- a/make_upgrade.sh +++ b/make_upgrade.sh @@ -15,8 +15,8 @@ MNT=/mnt/lncm DEV=/dev/mmcblk0p1 if [ "$(id -u)" -ne "0" ]; then - echo "This script must be run as root" - exit 1 + echo "This script must be run as root" + exit 1 fi # cmd_exists() { @@ -48,70 +48,70 @@ echo "Using ${ALP} as base distribution" echo 'Check for existing wpa_supplicant.automatic.conf' if [ -f ./wpa_supplicant.automatic.conf ]; then - echo "WPA supplicant automatic file exists, bootstrapping the network configuration" - cp ./etc/wpa_supplicant/wpa_supplicant.conf ./etc/wpa_supplicant/wpa_supplicant.conf.bak - cp ./wpa_supplicant.automatic.conf etc/wpa_supplicant/wpa_supplicant.conf + echo "WPA supplicant automatic file exists, bootstrapping the network configuration" + cp ./etc/wpa_supplicant/wpa_supplicant.conf ./etc/wpa_supplicant/wpa_supplicant.conf.bak + cp ./wpa_supplicant.automatic.conf etc/wpa_supplicant/wpa_supplicant.conf fi echo 'Check for authorized_keys.automatic' if [ -f ./authorized_keys.automatic ]; then - echo "Authorized keys file exists, bootstrapping the ssh authorized keys file" - if [ ! -d ./home/lncm/.ssh ]; then - mkdir -p ./home/lncm/.ssh - fi - cp ./authorized_keys.automatic ./home/lncm/.ssh/authorized_keys - echo "Reconfiguring SSHD to not allow for passwords" - cp ./etc/ssh/sshd_config ./etc/ssh/sshd_config.bak - sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/' ./etc/ssh/sshd_config + echo "Authorized keys file exists, bootstrapping the ssh authorized keys file" + if [ ! -d ./home/lncm/.ssh ]; then + mkdir -p ./home/lncm/.ssh + fi + cp ./authorized_keys.automatic ./home/lncm/.ssh/authorized_keys + echo "Reconfiguring SSHD to not allow for passwords" + cp ./etc/ssh/sshd_config ./etc/ssh/sshd_config.bak + sed -i 's/#PasswordAuthentication yes/PasswordAuthentication no/' ./etc/ssh/sshd_config fi echo 'Generate fresh box.apkovl.tar.gz from source' sh make_apkovl.sh # Cleanup files we created if [ -f ./etc/wpa_supplicant/wpa_supplicant.conf.bak ]; then - echo 'Restore old WPA Supplicant after making apkovl (and deleting the backup file)' - cp ./etc/wpa_supplicant/wpa_supplicant.conf.bak ./etc/wpa_supplicant/wpa_supplicant.conf - rm ./etc/wpa_supplicant/wpa_supplicant.conf.bak + echo 'Restore old WPA Supplicant after making apkovl (and deleting the backup file)' + cp ./etc/wpa_supplicant/wpa_supplicant.conf.bak ./etc/wpa_supplicant/wpa_supplicant.conf + rm ./etc/wpa_supplicant/wpa_supplicant.conf.bak fi # Cleanup authorized_keys if [ -d ./home/lncm/.ssh ]; then - echo "Remove .ssh directory" - rm -fr ./home/lncm/.ssh + echo "Remove .ssh directory" + rm -fr ./home/lncm/.ssh fi if [ -f ./etc/ssh/sshd_config.bak ]; then - echo "Restoring sshd_config to be equal with last commit" - cp ./etc/ssh/sshd_config.bak ./etc/ssh/sshd_config - rm ./etc/ssh/sshd_config.bak + echo "Restoring sshd_config to be equal with last commit" + cp ./etc/ssh/sshd_config.bak ./etc/ssh/sshd_config + rm ./etc/ssh/sshd_config.bak fi mkdir -p lncm-workdir cd lncm-workdir || exit if ! [ -f ${ALP} ]; then - echo "${ALP} not found, fetching..." - wget http://dl-cdn.alpinelinux.org/alpine/${REL}/releases/armhf/${ALP} + echo "${ALP} not found, fetching..." + wget http://dl-cdn.alpinelinux.org/alpine/${REL}/releases/armhf/${ALP} fi if ! [ -f ${IOT} ]; then - echo "${IOT} not found, fetching..." - wget https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${IOT} + echo "${IOT} not found, fetching..." + wget https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${IOT} fi if ! [ -f ${FIX} ]; then - echo "${FIX} not found, fetching..." - wget https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${FIX} + echo "${FIX} not found, fetching..." + wget https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${FIX} fi if ! [ -f ${CACHE} ]; then - echo "${CACHE} not found, fetching..." - wget https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${CACHE} + echo "${CACHE} not found, fetching..." + wget https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${CACHE} fi if ! [ -f ${NGINX} ]; then - echo "${NGINX} not found, fetching..." - wget https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${NGINX} + echo "${NGINX} not found, fetching..." + wget https://github.com/lncm/pi-factory/releases/download/${DOWNLOAD_VERSION}/${NGINX} fi echo "Unmount" @@ -153,4 +153,4 @@ echo "Unmount" umount ${MNT} echo "Done!" -echo "You can reboot your system to upgrade" \ No newline at end of file +echo "You can reboot your system to upgrade"