From f528104f68ec409e9ab098d93f8da6fbd6d686a9 Mon Sep 17 00:00:00 2001 From: glen Date: Fri, 5 Mar 2021 17:06:11 -0500 Subject: [PATCH] changes --- assets/Lokinet.desktop | 2 +- install.sh | 64 ------------------------------------------ installers/install.sh | 2 +- 3 files changed, 2 insertions(+), 66 deletions(-) delete mode 100755 install.sh diff --git a/assets/Lokinet.desktop b/assets/Lokinet.desktop index e4ef471..5277d09 100644 --- a/assets/Lokinet.desktop +++ b/assets/Lokinet.desktop @@ -5,4 +5,4 @@ Comment=Remove Lokinet Icon=/usr/share/pixmaps/lokiremove.png Exec=/etc/lokinet/assets/uninstall.sh Terminal=false -Categories=Internet; +Categories=Network diff --git a/install.sh b/install.sh deleted file mode 100755 index b77de3f..0000000 --- a/install.sh +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/bash - -lokinet_dir="/tmp/lokinet" - -function show_splash() { - - cyan='\033[1;36m' - - echo -e "${cyan}\n" - echo -e " _ _ _ _ " - echo -e " | | | | (_) | | " - echo -e " | | ___ | | ___ _ __ ___| |_ " - echo -e " | | / _ \| |/ / | '_ \ / _ \ __| " - echo -e " | |___| (_) | <| | | | | __/ |_" - echo -e " \_____/\___/|_|\_\_|_| |_|\___|\__| " - -echo "Install public key and add packages." -} - -function install_main () { - sudo modprobe tun - sudo curl -so /etc/apt/trusted.gpg.d/oxen.gpg https://deb.oxen.io/pub.gpg - echo "deb https://deb.oxen.io $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/oxen.list - -echo "Resync package repositories." - - sudo apt update - -echo "Install Lokinet-GUI" - - sudo apt install lokinet-gui -y -} - -function resolv_config () { - -echo "Install resolvconf and configure" - - sudo apt install resolvconf -y - sudo resolvconf -u - sudo systemctl restart lokinet - -} - # Fetches latest files from github to lokinet installation directory - function download_latest_files() { - - - if [ -d "$lokinet_dir" ]; then - sudo mv $lokinet_dir "$lokinet_dir.`date +%F-%R`" || install_error "Unable to remove old lokinet-installer directory" - fi - - install_log "Cloning latest files from github" - git clone --depth 1 https://github.com/necro-nemesis/Raspberry-Pi-OS-Lokinet $lokinet_dir || install_error "Unable to download files from github" - sudo mv $lokinet_dir/Lokinet.desktop /usr/share/applications/ || install_error "Unable to add startup entry" - sudo mv $lokinet_dir/img/lokiremove.png /usr/pixmaps/ || install_error "Unable to add startup icon" - - } - -function install_lokinet () { - show_splash - download_latest_files - install_main - resolv_config - echo "Installation complete!" -} diff --git a/installers/install.sh b/installers/install.sh index 98ff337..8b03819 100755 --- a/installers/install.sh +++ b/installers/install.sh @@ -60,7 +60,7 @@ function resolv_config () { git clone --depth 1 https://github.com/necro-nemesis/Raspberry-Pi-OS-Lokinet $lokinet_dir || install_error "Unable to download files from github" sudo mv $lokinet_dir/assets/Lokinet.desktop /usr/share/applications/Lokinet.desktop || install_error "Unable to add startup entry" sudo mv $lokinet_dir/img/lokiremove.png /usr/share/pixmaps/lokiremove.png || install_error "Unable to add startup icon" - + sudo chown -c root:root /usr/share/applications/Lokinet.desktop || install_error "Unable change owner and/or group." } # Outputs a Install log line