From 3dc68314f9b299e622e48a2dcca558db02663b2d Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 3 Apr 2021 00:56:42 -0500 Subject: [PATCH 1/8] Quick setup script added for Linux --- install/linux.sh | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100755 install/linux.sh diff --git a/install/linux.sh b/install/linux.sh new file mode 100755 index 0000000..0a2409b --- /dev/null +++ b/install/linux.sh @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +# /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/rbreaves/kinto/master/install/linux.sh)" + +curl https://github.com/rbreaves/kinto/archive/refs/heads/master.zip -J -L -o ~/Downloads/kinto.zip +unzip ~/Downloads/kinto.zip -d ~/Downloads/ +cd ~/Downloads/kinto-master/ + +if [ $# -eq 0 ];then + echo "Installing Kinto..." + ./setup.py +elif [ $1 == "-r" ];then + echo "Uninstall Kinto..." + ./setup.py -r +fi \ No newline at end of file From b0ba86623b2cead266a4360af3b2ff608412cf68 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 3 Apr 2021 01:09:04 -0500 Subject: [PATCH 2/8] Moved pillow dependency to install after pip3 is installed --- xkeysnail_service.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh index 3222c99..9551d1d 100755 --- a/xkeysnail_service.sh +++ b/xkeysnail_service.sh @@ -209,8 +209,6 @@ sudo systemctl disable xkeysnail >/dev/null 2>&1 sudo pkill -f bin/xkeysnail >/dev/null 2>&1 sudo pkill -f "is-active xkeysnail" >/dev/null 2>&1 -pip3 install pillow - # Add additional shortcuts if needed, does not modify existing ones if [[ $dename == 'gnome' || $dename == 'budgie' ]];then @@ -353,6 +351,8 @@ if [ "$distro" == 'linuxmint' ]; then pip3 install setuptools fi +pip3 install pillow + # echo "Transferring files..." mkdir -p ~/.config/kinto From e1e9b084426d9829054aeec438e09a1bf57caa9b Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 3 Apr 2021 01:15:00 -0500 Subject: [PATCH 3/8] Update README.md --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index e5023bf..223bdfc 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,15 @@ Video Tutorial: [Install Kinto.sh for Linux in less than a minute](https://www.y +### Quick Install Method + +Paste the following into your Terminal +``` +/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/rbreaves/kinto/master/install/linux.sh)" +``` + +### Old Install Method + 1. clone this repo ``` git clone https://github.com/rbreaves/kinto.git From fbc630f1d509c3129d13a693e92ab9e0f1bc0c33 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 3 Apr 2021 02:25:30 -0500 Subject: [PATCH 4/8] Updated quick install to pull in release & build correctly --- install/linux.sh | 6 ++++++ xkeysnail_service.sh | 11 ++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/install/linux.sh b/install/linux.sh index 0a2409b..71f188f 100755 --- a/install/linux.sh +++ b/install/linux.sh @@ -6,6 +6,12 @@ curl https://github.com/rbreaves/kinto/archive/refs/heads/master.zip -J -L -o ~/ unzip ~/Downloads/kinto.zip -d ~/Downloads/ cd ~/Downloads/kinto-master/ +kintorelease=`curl -s https://api.github.com/repos/rbreaves/kinto/releases/latest | awk -F'tag_name": ' '{if ($2) print $2}' | tr -d \",` +kintohash=`unzip -z ~/Downloads/kinto.zip | tail -n1` +kintoshort=${kintohash::7} + +echo "$kintorelease" "build" "$kintoshort" > ./dl_version + if [ $# -eq 0 ];then echo "Installing Kinto..." ./setup.py diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh index 9551d1d..bdc39e1 100755 --- a/xkeysnail_service.sh +++ b/xkeysnail_service.sh @@ -377,7 +377,16 @@ yes | cp -rf ./linux/xkeysnail.desktop ~/.config/kinto/xkeysnail.desktop # logoff fix - not solid for every os. Prevents missed 1 character input on login # yes | sudo cp -rf linux/gnome_logoff.sh ~/.config/kinto/logoff.sh -echo "$(git describe --tag --abbrev=0 | head -n 1)" "build" "$(git rev-parse --short HEAD)" > ~/.config/kinto/version +if [ -d "./.git" ] +then + echo "$(git describe --tag --abbrev=0 | head -n 1)" "build" "$(git rev-parse --short HEAD)" > ~/.config/kinto/version +elif [ -f "./dl_version" ]; then + cp ./dl_version ~/.config/kinto/version +else + # Not a typo - v is built in + echo "ersion Unknown" > ~/.config/kinto/version +fi + yes | cp -rf ./linux/kinto.py ./linux/kinto.py.new yes | cp -rf ./linux/limitedadmins ./linux/limitedadmins.new yes | cp -rf ./linux/gui/ ~/.config/kinto/ From 46354a971c37db856f683f444ef815d5e257e660 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 3 Apr 2021 03:36:22 -0500 Subject: [PATCH 5/8] Added git dependency install --- xkeysnail_service.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh index bdc39e1..bce86ee 100755 --- a/xkeysnail_service.sh +++ b/xkeysnail_service.sh @@ -324,6 +324,10 @@ expsh=" " # echo "Will need to install inotify-tools to restart key remapper live for config file changes..." # sudo ./linux/system-config/unipkg.sh inotify-tools # fi +if ! [ -x "$(command -v git)" ]; then + echo "Will need to install git..." + sudo ./linux/system-config/unipkg.sh git +fi if ! [ -x "$(command -v pip3)" ]; then echo "Will need to install python3-pip..." sudo ./linux/system-config/unipkg.sh python3-pip From d640ebfce7895563c58c2dba8b86b3835c2c9d2b Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 3 Apr 2021 17:32:13 -0500 Subject: [PATCH 6/8] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 223bdfc..3e5c784 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Video Tutorial: [Install Kinto.sh for Linux in less than a minute](https://www.y Paste the following into your Terminal ``` -/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/rbreaves/kinto/master/install/linux.sh)" +/bin/bash -c "$(curl -fsSL http://linux.kinto.sh)" ``` ### Old Install Method From 8fe1bc7772da98d46748522c8e91428e30f06148 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 3 Apr 2021 17:40:31 -0500 Subject: [PATCH 7/8] Added quick Windows installer --- install/windows.ps1 | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 install/windows.ps1 diff --git a/install/windows.ps1 b/install/windows.ps1 new file mode 100644 index 0000000..1d67a84 --- /dev/null +++ b/install/windows.ps1 @@ -0,0 +1,7 @@ +Invoke-WebRequest -Uri https://github.com/rbreaves/kinto/archive/refs/heads/master.zip -OutFile $env:USERPROFILE\Downloads\kinto.zip +Expand-Archive -LiteralPath "$env:USERPROFILE\Downloads\kinto.zip" -DestinationPath "$env:USERPROFILE\Downloads" -Force +Set-ExecutionPolicy Bypass -Scope Process -Force +iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex +choco install -y python3 +cd "$env:USERPROFILE\Downloads\kinto-master" +py .\setup.py \ No newline at end of file From 93b7fe8d490eb6b31c548469db8949fa9a436722 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sat, 3 Apr 2021 17:59:15 -0500 Subject: [PATCH 8/8] Update README.md --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3e5c784..5aedd3f 100644 --- a/README.md +++ b/README.md @@ -36,7 +36,7 @@ Video Tutorial: [Install Kinto.sh for Linux in less than a minute](https://www.y Paste the following into your Terminal ``` -/bin/bash -c "$(curl -fsSL http://linux.kinto.sh)" +/bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/rbreaves/kinto/master/install/linux.sh)" ``` ### Old Install Method @@ -98,10 +98,14 @@ Video Tutorial: [How to Install Kinto.sh on Windows 10](https://youtu.be/sRk8A8k ### Quick install Open Powershell as Administrator and copy and paste the following. This will download & extract Kinto, install chocolatey, python3 and then install Kinto. +**⚠ NOTE: Please inspect https://raw.githubusercontent.com/rbreaves/kinto/master/install/windows.ps1 and https://chocolatey.org/install.ps1 before running scripts directly. More information about running powershell scripts in this context can be found [here](https://chocolatey.org/install).** + ``` -Invoke-WebRequest -Uri https://github.com/rbreaves/kinto/archive/refs/heads/master.zip -OutFile $env:USERPROFILE\Downloads\kinto.zip;Expand-Archive -LiteralPath "$env:USERPROFILE\Downloads\kinto.zip" -DestinationPath "$env:USERPROFILE\Downloads" -Force;Set-ExecutionPolicy Bypass -Scope Process -Force; iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex; choco install -y python3;cd "$env:USERPROFILE\Downloads\kinto-master";py .\setup.py +Set-ExecutionPolicy Bypass -Scope Process -Force +iwr https://raw.githubusercontent.com/rbreaves/kinto/master/install/windows.ps1 -UseBasicParsing | iex ``` + Update system tray to show Kinto icon at all times (optional) ``` cmd /c "explorer shell:::{05d7b0f4-2121-4eff-bf6b-ed3f69b894d9}"