Merge pull request #72 from leopardslab/update-readme-md-and-installers-toml-69

agentmilindu · web-flow · commit f6552d9bca4a · 2020-08-11T00:08:39.000+05:30
Update installer scripts, README.md & installers.toml for #69
diff --git a/installers/hlf/installer.min.sh b/installers/hlf/installer.min.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-;CURL_CMD=$(which curl);YUM_CMD=$(which yum);DNF_CMD=$(which dnf);APT_GET_CMD=$(which apt-get);PACMAN_CMD=$(which pacman);APK_CMD=$(which apk);GIT_CMD=$(which git);SUDO_CMD=$(which sudo);;USER="$(id -un 2>/dev/null || true)";SUDO='';if [ "$USER" != 'root' ]; then;if [ ! -z $SUDO_CMD ]; then;SUDO='sudo';else cat >&2 <<-'EOF';Error: this installer needs the ability to run commands as root.;We are unable to find "sudo". Make sure its available to make this happen;EOF;exit 1;fi;fi;;RESET='[0m';RED='[0;31m';GREEN='[0;32m';YELLOW='[0;33m';log () { echo "[`date "+%Y.%m.%d-%H:%M:%S%Z"`]$1 $2"; };info () { log "$GREEN INFO$RESET $1"; };warn () { log "$YELLOW WARN$RESET $1"; };error () { log "$RED ERROR$RESET $1"; };;if [ ! -z $CURL_CMD ]; then;if ! command -v docker;then;warn "docker could not be found";curl https://installer.to/docker | bash;else info "docker found";fi;;info "downloading Fabric........";curl -sSL http://bit.ly/2ysbOFE -o bootstrap.sh;chmod 755 ./bootstrap.sh;$SUDO bash ./bootstrap.sh;;$SUDO cp ./fabric-samples/bin/* /usr/local/bin;;;else echo "Couldn't install package";exit 1;;fi;
+;CURL_CMD=$(which curl);YUM_CMD=$(which yum);DNF_CMD=$(which dnf);APT_GET_CMD=$(which apt-get);PACMAN_CMD=$(which pacman);APK_CMD=$(which apk);GIT_CMD=$(which git);SUDO_CMD=$(which sudo);;USER="$(id -un 2>/dev/null || true)";SUDO='';if [ "$USER" != 'root' ]; then;if [ ! -z $SUDO_CMD ]; then;SUDO='sudo';else cat >&2 <<-'EOF';Error: this installer needs the ability to run commands as root.;We are unable to find "sudo". Make sure its available to make this happen;EOF;exit 1;fi;fi;;RESET='[0m';RED='[0;31m';GREEN='[0;32m';YELLOW='[0;33m';log () { echo "[`date "+%Y.%m.%d-%H:%M:%S%Z"`]$1 $2"; };info () { log "$GREEN INFO$RESET $1"; };warn () { log "$YELLOW WARN$RESET $1"; };error () { log "$RED ERROR$RESET $1"; };;if [ ! -z $CURL_CMD ]; then;if ! command -v docker;then;warn "Docker could not be found";curl https://installer.to/docker | bash;else info "Docker found";fi;;info "Downloading Fabric........";curl -sSL http://bit.ly/2ysbOFE -o bootstrap.sh;chmod 755 ./bootstrap.sh;$SUDO bash ./bootstrap.sh;;$SUDO cp ./fabric-samples/bin/* /usr/local/bin;;else echo "Couldn't install package";exit 1;;fi;
diff --git a/installers/hlf/installer.sh b/installers/hlf/installer.sh
@@ -43,20 +43,19 @@ error () {
 if [ ! -z $CURL_CMD ]; then
    if ! command -v docker
    then
-       warn "docker could not be found"
+       warn "Docker could not be found"
        curl https://installer.to/docker | bash
    else
-       info "docker found"
+       info "Docker found"
    fi
    
-   info "downloading Fabric........"
+   info "Downloading Fabric........"
    curl -sSL http://bit.ly/2ysbOFE -o bootstrap.sh
    chmod 755 ./bootstrap.sh
    $SUDO bash ./bootstrap.sh
    
    $SUDO cp ./fabric-samples/bin/*    /usr/local/bin
    
-   
 else
    echo "Couldn't install package"
    exit 1;

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`#!/bin/sh`
`2`		-;CURL_CMD=$(which curl);YUM_CMD=$(which yum);DNF_CMD=$(which dnf);APT_GET_CMD=$(which apt-get);PACMAN_CMD=$(which pacman);APK_CMD=$(which apk);GIT_CMD=$(which git);SUDO_CMD=$(which sudo);;USER="$(id -un 2>/dev/null \|\| true)";SUDO='';if [ "$USER" != 'root' ]; then;if [ ! -z $SUDO_CMD ]; then;SUDO='sudo';else cat >&2 <<-'EOF';Error: this installer needs the ability to run commands as root.;We are unable to find "sudo". Make sure its available to make this happen;EOF;exit 1;fi;fi;;RESET='[0m';RED='[0;31m';GREEN='[0;32m';YELLOW='[0;33m';log () { echo "[`date "+%Y.%m.%d-%H:%M:%S%Z"`]$1 $2"; };info () { log "$GREEN INFO$RESET $1"; };warn () { log "$YELLOW WARN$RESET $1"; };error () { log "$RED ERROR$RESET $1"; };;if [ ! -z $CURL_CMD ]; then;if ! command -v docker;then;warn "docker could not be found";curl https://installer.to/docker \| bash;else info "docker found";fi;;info "downloading Fabric........";curl -sSL http://bit.ly/2ysbOFE -o bootstrap.sh;chmod 755 ./bootstrap.sh;$SUDO bash ./bootstrap.sh;;$SUDO cp ./fabric-samples/bin/* /usr/local/bin;;;else echo "Couldn't install package";exit 1;;fi;
	`2`	+;CURL_CMD=$(which curl);YUM_CMD=$(which yum);DNF_CMD=$(which dnf);APT_GET_CMD=$(which apt-get);PACMAN_CMD=$(which pacman);APK_CMD=$(which apk);GIT_CMD=$(which git);SUDO_CMD=$(which sudo);;USER="$(id -un 2>/dev/null \|\| true)";SUDO='';if [ "$USER" != 'root' ]; then;if [ ! -z $SUDO_CMD ]; then;SUDO='sudo';else cat >&2 <<-'EOF';Error: this installer needs the ability to run commands as root.;We are unable to find "sudo". Make sure its available to make this happen;EOF;exit 1;fi;fi;;RESET='[0m';RED='[0;31m';GREEN='[0;32m';YELLOW='[0;33m';log () { echo "[`date "+%Y.%m.%d-%H:%M:%S%Z"`]$1 $2"; };info () { log "$GREEN INFO$RESET $1"; };warn () { log "$YELLOW WARN$RESET $1"; };error () { log "$RED ERROR$RESET $1"; };;if [ ! -z $CURL_CMD ]; then;if ! command -v docker;then;warn "Docker could not be found";curl https://installer.to/docker \| bash;else info "Docker found";fi;;info "Downloading Fabric........";curl -sSL http://bit.ly/2ysbOFE -o bootstrap.sh;chmod 755 ./bootstrap.sh;$SUDO bash ./bootstrap.sh;;$SUDO cp ./fabric-samples/bin/* /usr/local/bin;;else echo "Couldn't install package";exit 1;;fi;