Merge pull request #10 from vgeruso/develop

Develop

README.md

@@ -16,7 +16,7 @@ The cpn requires the following systems installed:
 In the root directory `~/` execute:
 
 ```bash
-$ wget https://raw.githubusercontent.com/vgeruso/cpn/1.2.1/install.sh
+$ wget https://raw.githubusercontent.com/vgeruso/cpn/1.2.2/install.sh
 ```
 
 ```bash

cpn.sh

@@ -3,16 +3,5 @@ if test $1
 then
   bash $CPN_DIR/src/options.sh $1 $2
 else
-  echo "cpn version 1.2.0"
-  echo
-  echo "Usage: cpn <command> [<arg>]" 
-  echo
-  echo "These are common cpn commands:"
-  echo
-  echo "Start a working area:"
-  echo "  init <name project>   Create you project api node"
-  echo
-  echo "Perform maintenance on your cpn"
-  echo "  update                Update cpn on your machine"
-  echo "  uninstall             Uninstal cpn from your machine"
+  bash $CPN_DIR/src/help.sh
 fi

install.sh

@@ -8,6 +8,8 @@ sudo chomd 733 ./src/init.sh
 sudo chmod 733 ./src/options.sh
 sudo chmod 733 ./src/uninstall.sh
 sudo chmod 733 ./src/update.sh
+sudo chomd 733 ./src/help.sh
+sudo chomd 733 ./src/version.sh
 
 sudo cp cpn.sh /usr/bin
 cd /usr/bin
@@ -18,29 +20,33 @@ cd ~/
 
 if test $HOME/.bash_profile
 then
+  echo -e
   echo -e '#cpn' >> .bash_profile
   echo -e 'export CPN_DIR="${HOME}/.cpn"' >> .bash_profile
 fi
 
 if test $HOME/.zshrc
 then
+  echo -e
   echo -e '#cpn' >> .zshrc
   echo -e 'export CPN_DIR="${HOME}/.cpn"' >> .zshrc
 fi
 
 if test $HOME/.profile
 then
+  echo -e
   echo -e '#cpn' >> .profile
   echo -e 'export CPN_DIR="${HOME}/.cpn"' >> .profile
 fi
 
 if test $HOME/.bashrc
 then
+  echo -e
   echo -e '#cpn' >> .bashrc
   echo -e 'export CPN_DIR="${HOME}/.cpn"' >> .bashrc
 fi
 
 echo
-$CPN_DIR/src/help.sh
+bash $CPN_DIR/src/help.sh
 
 rm install.sh

src/help.sh

@@ -1,6 +1,6 @@
-echo "cpn version 1.2.1"
+echo "cpn version 1.2.2"
 echo
-echo "Usage: cpn [<flag>] <command> [<arg>]"
+echo "Usage: cpn [<flag>] [<command>] [<arg>]"
 echo
 echo "These are common cpn commands:"
 echo
@@ -12,4 +12,5 @@ echo "  update                Update cpn on your machine"
 echo "  uninstall             Uninstal cpn from your machine"
 echo 
 echo "These are common cpn flags:"
-echo " -h or --help           Show this help list"
+echo " -h or --help           Show this help list"
+echo " -v or --version        Show version cpn"

src/options.sh

@@ -11,8 +11,7 @@ fi
 
 if test $1 == "update"
 then
-  # bash $CPN_DIR/src/update.sh
-  echo "Update => $1 => In development"
+  bash $CPN_DIR/src/update.sh
 fi
 
 if test $1 == "-h"
@@ -23,4 +22,14 @@ fi
 if test $1 == "--help"
 then
   bash $CPN_DIR/src/help.sh
+fi
+
+if test $1 == "-v"
+then
+  bash $CPN_DIR/src/version.sh
+fi
+
+if test $1 == "--version"
+then
+  bash $CPN_DIR/src/version.sh
 fi

src/update.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 cd $CPN_DIR
+
 PULL=$(git pull)
+VERSION=$(cpn -v)
 
 if test $PULL == "Already up to date!"
 then
@@ -9,21 +11,31 @@ then
 else
   git pull
 
-  sudo chmod 733 ../cpn.sh
+  sudo chmod 733 cpn.sh
   sudo chomd 733 ./src/init.sh
   sudo chmod 733 ./src/options.sh
   sudo chmod 733 ./src/uninstall.sh
   sudo chmod 733 ./src/update.sh
+  sudo chomd 733 ./src/help.sh
+  sudo chomd 733 ./src/version.sh
 
   cd /usr/bin
   sudo rm cpn
 
-  sudo cp ../cpn.sh /usr/bin
+  sudo cp $CPN_DIR/cpn.sh /usr/bin
   cd /usr/bin
   sudo mv cpn.sh cpn
   sudo chmod 777 cpn
 
-  echo "Update successfully!"
-  echo
-  $CPN_DIR/src/help.sh
+  NEW_VERSION=$(cpn -v)
+
+  if test $VERSION != $NEW_VERSION
+    echo "Update successfully!"
+    echo
+  else
+    echo "Update error contact support"
+    echo
+  fi
+
+  bash $CPN_DIR/src/help.sh
 fi

src/version.sh

@@ -0,0 +1 @@
+echo "1.2.2"