Added quick Windows installer

Quick setup script added for Linux

README.md

@@ -32,6 +32,15 @@ Video Tutorial: [Install Kinto.sh for Linux in less than a minute](https://www.y
 
 <img src="https://user-images.githubusercontent.com/10969616/97070698-179c4500-15a0-11eb-8064-c03aa7f4d4a5.png" width="75%">
 
+### 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

install/linux.sh

@@ -0,0 +1,21 @@
+#!/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/
+
+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
+elif [ $1 == "-r" ];then
+	echo "Uninstall Kinto..."
+	./setup.py -r
+fi

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

linux/system-config/unipkg.sh

@@ -1,31 +1,15 @@
 #!/bin/bash
 
 if pkgmgr="$( which apt-get )" 2> /dev/null; then
-   echo 
+   echo "Debian"
-   echo "Debian apt-get package manager detected... "
-   echo "Installing $1... "
-   echo 
    $pkgmgr update
-   $pkgmgr --yes install $1
+   $pkgmgr --yes --force-yes install $1
 elif pkgmgr="$( which dnf )" 2> /dev/null; then
-   echo 
+   echo "dnf"
-   echo "dnf package manager detected... "
-   echo "Installing $1... "
-   echo 
    $pkgmgr check-update; $pkgmgr install -y $1
 elif pkgmgr="$( which pacman )" 2> /dev/null; then
-   echo 
+   echo "Arch-based"
-   echo "Arch-based pacman package manager detected... "
-   echo "Installing $1... "
-   echo 
    $pkgmgr -Syy;yes | $pkgmgr -S $1
-elif pkgmgr="$( which zypper )" 2> /dev/null; then
-   echo 
-   echo "zypper package manager detected... "
-   echo "Installing $1... "
-   echo 
-   $pkgmgr refresh
-   $pkgmgr -n install $1
 else
    echo "Package manager not found, please install $1" >&2
    exit 1
@@ -34,4 +18,4 @@ if [[ 1 -ne $# ]]; then
    echo "Syntax: $0 PACKAGE"
    exit 1
 fi
-exit $?
+exit $?

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
@@ -250,8 +248,6 @@ fi
 if [[ $dename == "kde" ]]; then
 	if [[ $distro == "manjarolinux" ]]; then
 		sudo ./linux/system-config/unipkg.sh vte3
-	elif [[ ${distro:0:8} == "opensuse" ]];then
-		sudo ./linux/system-config/unipkg.sh vte-devel-0.62.3
 	else
 		sudo ./linux/system-config/unipkg.sh libvte-2.91-dev
 	fi
@@ -328,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
@@ -337,10 +337,8 @@ if ! [ -x "$(command -v python3-config)" ]; then
 		pydev="python3-dev"
 	elif [ "$distro" == "fedora" ]; then
 		pydev="python3-devel"
-	elif [ "${distro:0:8}" == "opensuse" ]; then
-		pydev="python3-devel python3-gobject python3-gobject-Gdk typelib-1_0-Gtk-3_0 libgtk-3-0"
 	fi
-	if [ "$distro" == "gnome" ] || [ "$distro" == "fedora" ] || [ "$distro" == "debian" ] || [ "$distro" == 'linuxmint' ] || [ "${distro:0:8}" == "opensuse" ]; then
+	if [ "$distro" == "gnome" ] || [ "$distro" == "fedora" ] || [ "$distro" == "debian" ] || [ "$distro" == 'linuxmint' ]; then
 		echo "Will need to install $pydev..."
 		sudo ./linux/system-config/unipkg.sh "$pydev"
 	fi
@@ -349,16 +347,16 @@ fi
 # 	sudo ./linux/system-config/unipkg.sh gnome-tweaks gnome-shell-extension-appindicator gir1.2-appindicator3-0.1
 # fi
 if ! [ -x "$(command -v xhost)" ] || ! [ -x "$(command -v gcc)" ]; then
-	if [ "$distro" == "manjarolinux" ]; then
+	if [ "$distro" == "\"manjaro linux\"" ]; then
 		sudo ./linux/system-config/unipkg.sh "xorg-xhost gcc"
-	elif [ "${distro:0:8}" == "opensuse" ]; then
-		sudo ./linux/system-config/unipkg.sh "gcc"
 	fi
 fi
 if [ "$distro" == 'linuxmint' ]; then
 	pip3 install setuptools
 fi
 
+pip3 install pillow
+
 # echo "Transferring files..."
 mkdir -p ~/.config/kinto
 
@@ -383,7 +381,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/
@@ -497,12 +504,6 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	fi
 	sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./linux/xkeysnail.service.new
 	sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./linux/limitedadmins.new
-	
-	# openSUSE needs DISPLAY exported inside main command to avoid display "" not found error. 
-	if [[ ${distro:0:8} == "opensuse" ]];then
-		sed -i "s#'/usr/bin/xhost#'export DISPLAY=`echo $DISPLAY` \&\& /usr/bin/xhost#g" ./linux/xkeysnail.service.new
-	fi
-	
 	sudo mv ./linux/xkeysnail.service.new "$xkeypath"xkeysnail.service && echo "Service file added to "$xkeypath"xkeysnail.service"
 	sudo chown root:root ./linux/limitedadmins.new
 	# Add a check here for xkeysnail path resolving