Merge pull request #9 from Heshdude/creating-installer-generator

Adding curl as a install method

generate.py

@@ -5,6 +5,7 @@
 import errno
 
 methods = {
+   "curl": "$CURL",
    "apt": "$APT_GET",
    "yum": "$YUM",
    "dnf": "$DNF",
@@ -36,6 +37,7 @@ def generate(path):
 
       installer_sh.write("""#!/bin/sh
       
+CURL_CMD=$(which curl) # curl tool
 YUM_CMD=$(which yum) # yum package manager for RHEL & CentOS
 DNF_CMD=$(which dnf) # dnf package manager for new RHEL & CentOS
 APT_GET_CMD=$(which apt-get) # apt package manager for Ubuntu & other Debian based distributions
@@ -47,7 +49,7 @@ def generate(path):
 USER="$(id -un 2>/dev/null || true)"
 SUDO=''
 if [ "$USER" != 'root' ]; then
-	if $SUDO_CMD; then
+	if [ ! -z $SUDO_CMD ]; then
 		SUDO='sudo'
 	else
 		cat >&2 <<-'EOF'

installers/git/installer.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+CURL_CMD=$(which curl) # curl tool
 YUM_CMD=$(which yum) # yum package manager for RHEL & CentOS
 DNF_CMD=$(which dnf) # dnf package manager for new RHEL & CentOS
 APT_GET_CMD=$(which apt-get) # apt package manager for Ubuntu & other Debian based distributions
@@ -22,8 +23,6 @@ if [ "$USER" != 'root' ]; then
 	fi
 fi
 
-echo $SUDO
-
 if [ ! -z $APT_GET_CMD ]; then
    $SUDO apt-get update
    $SUDO apt-get install git
@@ -43,4 +42,4 @@ elif [ ! -z $APK_CMD ]; then
 else
    echo "Couldn't install package"
    exit 1;
-fi
+fi

installers/hello/installer.sh

@@ -1,11 +1,27 @@
 #!/bin/sh
 
+CURL_CMD=$(which curl) # curl tool
 YUM_CMD=$(which yum) # yum package manager for RHEL & CentOS
 DNF_CMD=$(which dnf) # dnf package manager for new RHEL & CentOS
 APT_GET_CMD=$(which apt-get) # apt package manager for Ubuntu & other Debian based distributions
 PACMAN_CMD=$(which pacman) # pacman package manager for ArchLinux
 APK_CMD=$(which apk) # apk package manager for Alpine
 GIT_CMD=$(which git) # to build from source pulling from git
+SUDO_CMD=$(which sudo) # check if sudo command is there
+
+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
 
 if [ ! -z $APT_GET_CMD ]; then
    echo "Installing hello"
@@ -15,6 +31,10 @@ elif [ ! -z $YUM_CMD ]; then
    echo "Installing hello"
    echo "Installed hello"
 
+elif [ ! -z $PACMAN_CMD ]; then
+   echo "Installing hello"
+   echo "Installed hello"
+
 elif [ ! -z $APK_CMD ]; then
    echo "Installing hello"
    echo "Installed hello"
@@ -23,6 +43,10 @@ elif [ ! -z $DNF_CMD ]; then
    echo "Installing hello"
    echo "Installed hello"
 
+elif [ ! -z $CURL_CMD ]; then
+   echo "Installing hello"
+   echo "Installed hello"
+
 else
    echo "Couldn't install package"
    exit 1;

installers/hello/installer.toml

@@ -27,3 +27,9 @@ sh = """
 echo "Installing hello"
 echo "Installed hello"
 """
+
+[curl]
+sh = """
+echo "Installing hello"
+echo "Installed hello"
+"""

installers/hello/spec/hello_spec.sh

@@ -2,7 +2,7 @@ Describe "Installer script for"
   Describe "hello"
     It "should say hello!"
       When call installers/hello/installer.sh
-      The output should eq "Hello!"
+      The output should include "Installed"
     End
   End
 End

installers/nginx/installer.sh

@@ -1,11 +1,27 @@
 #!/bin/sh
 
+CURL_CMD=$(which curl) # curl tool
 YUM_CMD=$(which yum) # yum package manager for RHEL & CentOS
 DNF_CMD=$(which dnf) # dnf package manager for new RHEL & CentOS
 APT_GET_CMD=$(which apt-get) # apt package manager for Ubuntu & other Debian based distributions
 PACMAN_CMD=$(which pacman) # pacman package manager for ArchLinux
 APK_CMD=$(which apk) # apk package manager for Alpine
 GIT_CMD=$(which git) # to build from source pulling from git
+SUDO_CMD=$(which sudo) # check if sudo command is there
+
+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
 
 if [ ! -z $APT_GET_CMD ]; then
    sudo apt-get update
@@ -15,7 +31,7 @@ elif [ ! -z $YUM_CMD ]; then
    sudo yum install nginx
 
 elif [ ! -z $PACMAN_CMD ]; then
-   sudo pacman -S nginx
+   $SUDO pacman -S nginx
 
 elif [ ! -z $APK_CMD ]; then
    sudo apk update

installers/node/installer.sh

@@ -1,11 +1,27 @@
 #!/bin/sh
 
+CURL_CMD=$(which curl) # curl tool
 YUM_CMD=$(which yum) # yum package manager for RHEL & CentOS
 DNF_CMD=$(which dnf) # dnf package manager for new RHEL & CentOS
 APT_GET_CMD=$(which apt-get) # apt package manager for Ubuntu & other Debian based distributions
 PACMAN_CMD=$(which pacman) # pacman package manager for ArchLinux
 APK_CMD=$(which apk) # apk package manager for Alpine
 GIT_CMD=$(which git) # to build from source pulling from git
+SUDO_CMD=$(which sudo) # check if sudo command is there
+
+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
 
 if [ ! -z $APT_GET_CMD ]; then
    if [  -n "$(uname -a | grep Ubuntu)" ]; then

installers/python3/installer.sh

@@ -1,5 +1,6 @@
 #!/bin/sh
 
+CURL_CMD=$(which curl) # curl tool
 YUM_CMD=$(which yum) # yum package manager for RHEL & CentOS
 DNF_CMD=$(which dnf) # dnf package manager for new RHEL & CentOS
 APT_GET_CMD=$(which apt-get) # apt package manager for Ubuntu & other Debian based distributions
@@ -8,6 +9,20 @@ APK_CMD=$(which apk) # apk package manager for Alpine
 GIT_CMD=$(which git) # to build from source pulling from git
 SUDO_CMD=$(which sudo) # check if sudo command is there
 
+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
+
 if [ ! -z $APT_GET_CMD ]; then
    sudo apt-get update
    sudo apt-get install python3