README.md

@@ -42,13 +42,25 @@ Build
 For building **shellinabox** from source on Debian or RHEL based systems use commands
 listed below. This will create executable file `shellinaboxd` in project directory.
 
-1. Clone the autotools
+1. Install dependencies
 
    ```
-    wget https://raw.githubusercontent.com/simono41/shellinabox/master/auto.sh
+    apt-get install git libssl-dev libpam0g-dev zlib1g-dev dh-autoreconf
+   ```
+   
+   or
+   
+   ```
+   yum install git openssl-devel pam-devel zlib-devel autoconf automake libtool
    ```
 
-3. Run autotools 
+2. Clone source files and move to project directory
+
+   ```
+    git clone https://github.com/simono41/shellinabox.git && cd shellinabox
+   ```
+
+3. Run autotools in project directory
 
    ```
     chmod +x auto.sh

auto.sh

@@ -1,28 +1,20 @@
 #!/bin/bash
 
-set -ex
-
 if [[ $EUID -ne 0 ]]; then
    echo "This script must be run as root" 1>&2
    exit 1
 fi
   echo "Als root Angemeldet"
+  
+apt-get install git libssl-dev libpam0g-dev zlib1g-dev dh-autoreconf
 
-if [ -f /usr/bin/apt ]; then
-  apt update
+pacman -S git openssl autoconf automake make gcc
 
-  apt install git libssl-dev libpam0g-dev zlib1g-dev dh-autoreconf
-fi
-
-if [ -f /usr/bin/pacman ]; then
-  pacman -Sy git openssl autoconf automake make gcc
-fi
+sleep 5
 
 cd /opt/
 
-git clone https://github.com/simono41/shellinabox.git
-
-cd shellinabox
+git clone https://github.com/simono41/shellinabox.git && cd shellinabox
 
 autoreconf -i
 
@@ -42,8 +34,6 @@ useradd webssh
 
 mkdir /home/webssh
 
-cp shellinabox_sshwrapper.sh /home/webssh/
-
 chmod 770 -R /home/webssh/
 
 chown -cR webssh:webssh /home/webssh/
@@ -53,4 +43,6 @@ webssh
 webssh
 EOT
 
-systemctl start shellinabox.service &
+cp shellinabox_sshwrapper.sh /home/webssh/
+
+systemctl start shellinabox.service

sgit

@@ -1,22 +0,0 @@
-#!/bin/bash
-
-set -ex
-
-if [[ "--help" == "${1}" ]]; then
-echo "bash ./sgit user.email commit"
-fi
-
-if [[ -z "${2}" ]]; then
-echo "Bitte email und commit angeben!!!"
-exit 1
-fi
-
-git config --global user.email "${1}"
-git config --global user.name "${1}"
-git status
-git pull
-git add --all
-git commit --all -m "${2}"
-git show
-git push
-git status

shellinabox.service

@@ -3,7 +3,7 @@ Description=shellinabox
 
 [Service]
 Type=oneshot
-ExecStart=/opt/shellinabox/shellinaboxd -t --service=/:webssh:webssh:HOME:'/home/webssh/shellinabox_sshwrapper.sh'
+ExecStart=/opt/shellinabox/shellinaboxd --cert=/tmp/ --service=/:webssh:webssh:HOME:'/home/webssh/shellinabox_sshwrapper.sh'
 
 [Install]
 WantedBy=multi-user.target

shellinabox_sshwrapper.sh

@@ -1,17 +1,12 @@
 #!/bin/bash
-#
-set -ex
 # 
-read -p "SSH remote host (hostname or ip address) [localhost] : " host;
-[[ -z "${host}" ]] && host=localhost;
+read -p "SSH remote host (hostname or ip address): " host;
 #
-read -p "If a puplic_key authentification?: [y/N] : " puplic;
+read -p "If a puplic_key authentification?: N or y: " puplic;
 #
-read -p "SSH remote port [22] : " port;
-[[ -z "${port}" ]] && port=22;
+read -p "SSH remote port (22): " port;
 #
-read -p "SSH remote username [pi] : " username;
-[[ -z "${username}" ]] && username=pi;
+read -p "SSH remote username: " username;
 #
 if [ "$puplic" == "y" ];
   then
@@ -19,9 +14,8 @@ if [ "$puplic" == "y" ];
     echo $key > ~/.ssh/id_rsa.pub;
 
     rm ~/.ssh/id_rsa;
-    echo "Enter your private id here and press the enter key for a new line !!!";
-    id=null
-    while [ "$id" != "" ];
+    echo "Enter your private id here and press the enter key for a new line and when you are done confirm with finish !!!";
+    while [ "$id" != "finish" ];
       do
       read -p "How is your id_rsa key?: " id;
       echo $id >> ~/.ssh/id_rsa;