Merge lp:~sradhara/charms/trusty/ibm-xl-fortran/ibm-xl-fortranfix into lp:~ibmcharmers/charms/trusty/ibm-xl-fortran/devel

[sunitha]

[vsr (vsasi)]

review: Needs Fixing

[lp:~sradhara/charms/trusty/ibm-xl-fortran/ibm-xl-fortranfix]

44. By sunitha on 2015-08-26

IBM XL Fortran final chcek in

=== modified file 'README.md'
--- README.md	2015-08-21 07:05:52 +0000
+++ README.md	2015-08-26 08:29:13 +0000
@@ -1,8 +1,10 @@
 Charm for IBM XL FORTRAN for Linux 15.1.2, Evaluation
 
+
 Overview
 --------
 
+
 IBM XL FORTRAN for Linux V15.1.2, Evaluation
 
 IBM XL FORTRAN for Linux, V15.1.2 is a standards-based, high-performance Fortran compiler with advanced optimization and performance-tuning features.
@@ -10,13 +12,18 @@
 For details on IBM XL FORTRAN, as well as information on purchasing the trial version,
 please visit: [Trial Download] [trial-xlf].
 
-To get more details about the product and useful additional resources , please visit the product page
+To get more details about the product and useful additional resources, please visit the product page
 [Product Page] [product-page] and [IBM Knowledge Center] [ibm-xlf-info]
 
+
 Usage
 -----
-Download IBM XL FORTRAN for Linux  and upload it to your apache
-repository. To download and install the code contained in this charm you must agree to the IBM license. 
+
+Download your 60 day trial version for IBM XL Fortran for Linux  and upload it to your apache
+repository. To download and install the code contained in this charm you must agree to the IBM license.
+The License files (`LicenseAgreement.pdf` and `license.pdf` ) can be found under the `files/archives` folder
+after extraction of IBM Fortran compiler software is successful.
+ 
 
 # Creating the repositories in Apache
 Run steps below with admin access
@@ -29,8 +36,8 @@
         cd <apache-repository-directory>
         mkdir ibm-xlf
 
-Place the downloaded IBM XL FORTRAN for Linux packages in the above directory
-Configure Apache server to allow access to the repository.
+Place the downloaded IBM XL FORTRAN for Linux packages in the above directory and Configure Apache server to allow access to the repository.
+
 Configure config.yaml with the repository url
  
  Example : fortran_url: "http://<server-name>/<REPOSITORY_DIR>/fortran_url"
@@ -38,6 +45,7 @@
  Verify repository is set correctly otherwise charm might throw errors.
 
 
+
 Deploy
 ------
 
@@ -54,9 +62,10 @@
     
 If not,
         
-     juju set ibm_xl-fortran accept-ibm-xlfortran-license=True fortran-url=<repository URL> xlfortran_package_name=<Installation package name> sha_fortran=<sha sum of the xlf package>
-
-This charm will deploy the IBM XL FORTRAN compiler packages.For verification purpose,sample Fortran program will be created after deployment of this charm.The sample programs will be created in `Amulet test` and it can be compliled and run through Amulet test only.
+     juju set ibm-xl-fortran accept-ibm-xlfortran-license=True fortran-url=<repository URL> xlfortran_package_name=<Installation package name> sha_fortran=<sha sum of the xlf package>
+
+This charm will deploy the IBM XL FORTRAN compiler packages. For verification purpose,sample Fortran program will be created after deployment of this charm.The sample programs will be created in `Amulet test` and it can be compliled and run through Amulet test only.
+
     
 Configuration
 -------------
@@ -64,14 +73,14 @@
 
 `xlfortran_url`          
 
-URL to download IBM XL FORTRAN packages.The url would be in this format  
-http://<server-name>/<REPOSITORY_DIR>/ibm-xlf.If not set or set incorrectly, the charm
+URL to download IBM XL FORTRAN packages. The url would be in this format  
+http://<server-name>/<REPOSITORY_DIR>/ibm-xlf. If not set or set incorrectly, the charm
 cannot install the IBM XL FORTRAN software.
 
 `accept-ibm-xlfortran-license`
 
 The IBM XL FORTRAN software can only be used by accepting the terms and conditions for IBM 
-XL FORTRAN License.Setting this option to True indicates that you have read and accepted the
+XL FORTRAN License. Setting this option to True indicates that you have read and accepted the
 IBM XL FORTRAN terms and conditions found in the license file.
 
 `xlfortran_package_name`
@@ -82,7 +91,7 @@
 
 Checksum value to check integrity of IBM XL FORTRAN package. The Charm uses
 sha1sum to check the integrity. If empty, it does not carry out the integrity check.
-The command to find the checksum is : sha1sum <Package Name> | cut -d" " -f1
+The command to find the checksum is: "sha1sum <Package Name> | cut -d" " -f1"
 
 
 IBM XL FORTRAN Information

=== modified file 'config.yaml'
--- config.yaml	2015-08-21 06:48:17 +0000
+++ config.yaml	2015-08-26 08:29:13 +0000
@@ -13,8 +13,12 @@
     type: boolean
     default: False
     description: |
-        IBM XL Fortran for Linux is an advanced,high-performance compiler that can be used for developing complex,computationally intensive programs,
-        including interlanguage calls with C programs.
+        The XL_FORTRAN software can only be used by
+        accepting the terms and conditions for IBM XL_FORTRAN License.
+        Setting this option to True 
+        indicates that you have read and accepted the IBM XL_FORTRAN terms and 
+        conditions found in the license file. The details about accessing
+        the license(s) can be found in the README. 
   fortran_path_name:
     type: string
     default: "/opt/ibm"

=== modified file 'hooks/config-changed'
--- hooks/config-changed	2015-08-21 05:32:04 +0000
+++ hooks/config-changed	2015-08-26 08:29:13 +0000
@@ -8,13 +8,15 @@
 #Check Fortran is installed or not
 is_fortran_installed()
 {
- if [ -d $FORTRAN_INSTALL_PATH ]; then
-          echo "True"
-          juju-log "IBM XL Fortran: Fortran is installed"
- else
-          echo "False"
-          juju-log "IBM XL Fortran: Fortran is not installed"
- fi
+        if [ -d $FORTRAN_INSTALL_PATH/xlf ]; then
+              echo "True"
+              juju-log "IBM XL Fortran: Fortran is installed"
+        else
+              echo "False"
+              juju-log "IBM XL Fortran: Fortran is not installed"
+        fi
+
+ 
 }
 
 #It will Remove IBM XL Fortran, if its installed
@@ -30,8 +32,10 @@
            #remove packages
            dpkg -P xlf.$xlf_version libxlf-devel.$xlf_version
            if ! [ -d $FORTRAN_INSTALL_PATH/xlf/$xlf_version/bin ]; then
-                    
-                     juju-log "IBM XL Fortran: Sucessfully uninstalled Fortran"
+                     juju-log "IBM XL Fortran: Successfully uninstalled Fortran"
+                     cd $FORTRAN_INSTALL_PATH
+                     rm -rf xlf
+                     juju-log "IBM XL Fortran: Removed xlf folder" 
                      status-set blocked "IBM XL Fortran license not accepted" 
                       
            else
@@ -40,8 +44,8 @@
            fi
 
     else
-          juju-log "IBM XL Fortran: Fortran is not installed"
-          exit 0
+           juju-log "IBM XL Fortran: Fortran is not installed"
+           exit 0
     fi
 }
 
@@ -139,57 +143,56 @@
           #downlaod IBM XL Fortran package
           download_Fortran
                
-          #extract MFSVR package if download succeeded
+          #extract IBM XL Fortran  package if download succeeded
           if [ -f $ARCHIVE_DIR/$cfg_pkg_name ]; then
                   juju-log "IBM XL Fortran: Extracting binary package"
                   status-set maintenance "Extracting IBM XL FORTRAN package"
                   cd $ARCHIVE_DIR
                   if ! [ -d $ARCHIVE_DIR/Fortran ]; then
-                         mkdir Fortran
-                         chmod 777 Fortran
-                         tar -xzf $ARCHIVE_DIR/$cfg_pkg_name -C Fortran
+                           mkdir Fortran
+                           chmod 755 Fortran
+                           tar -xzf $ARCHIVE_DIR/$cfg_pkg_name -C Fortran
+                           if [ $? != 0 ]; then
+                                 juju-log "IBM XL Fortran: Unable to extract the Fortran  package content. Verify whether the package is corrupt."
+                                 #Remove corrupt archive file
+                                 rm -rf $ARCHIVE_DIR/*.tar.gz
+                                 exit 0
+ 
+                           fi
+
+                  fi
+
+          fi
+                  
+          juju-log "Starting Fortran installation"
+          #Check Fortran package availability
+
+          if [ -f $CHARM_DIR/files/archives/Fortran/install ]; then
+                  juju-log "Fortran Packages available for installation.";
+                  fortran_install_done=`is_fortran_installed`   
+                  if [ $fortran_install_done == False ]; then
+                        status-set maintenance "Installing IBM XL FORTRAN package"
+                        echo 1 | $CHARM_DIR/files/archives/Fortran/install
+                        if [ $? == 0 ]; then
+                              juju-log "IBM XL Fortran: Fortran is installed successfully"
+                              status-set active "Installed IBM XL FORTRAN package successfully"
+                        else
+                              juju-log "IBM XL Fortran: Error while installing Fortran"
+                              exit 1
+                        fi
+
                   else
-                         juju-log "IBM XL Fortran: Fortran directoty is alredy exist"
-              
-                  fi
-
-                  if [ $? != 0 ]; then
-                         juju-log "IBM XL Fortran: Unable to extract the Fortran  package content. Verify whether the package is corrupt."
-                         #Remove corrupt archive file
-                         rm -rf $ARCHIVE_DIR/*.tar.gz
-                         exit 0
-             
-                  fi
-            
+                        juju-log "IBM XL Fortran: Fortran is alreay installed"
+
+                  fi 
+
+          
+          else
+                  juju-log "IBM XL Fortran: Fortran Packages are missing. Please check README file.";
+                  exit 1
+
+
           fi
-     
-           juju-log "IBM XL Fortran: Fortran package downloaded sucessfully."
-           
-
-fi
-
-juju-log "Starting Fortran installation"
-#Check Fortran package availability
-
-if [ -f $CHARM_DIR/files/archives/Fortran/install ]; then
-      juju-log "Fortran Packages available for installation.";
-      if ! [ -d $FORTRAN_INSTALL_PATH/xlf/bin ]; then
-              status-set maintenance "Installing IBM XL FORTRAN package"
-              echo 1 | $CHARM_DIR/files/archives/Fortran/install
-              
-              if [ $? == 0 ]; then
-                     juju-log "IBM XL Fortran: Fortran is installed sucessfully"
-                     status-set maintenance "Installed IBM XL FORTRAN package sucessfully"
-              else
-                     juju-log "IBM XL Fortran: Error while installing Fortran"
-                     exit 1
-              fi
-      else
-             juju-log "IBM XL Fortran: Fortran is alreay installed"
-      fi 
-else
-      juju-log "IBM XL Fortran: Fortran Packages are missing. Please check README file.";
-      exit 1
 
 fi
 

=== modified file 'hooks/stop'
--- hooks/stop	2015-08-21 05:32:04 +0000
+++ hooks/stop	2015-08-26 08:29:13 +0000
@@ -2,11 +2,12 @@
 set -e
 juju-log "starting stop hook"
 FORTRAN_PATH=$(config-get fortran_path_name)
-echo $FORTRAN_PATH
-rm -rf $FORTRAN_PATH
-
-if ! [-d $FORTRAN_PATH ]; then
-       juju-log "Fortran path removed sucessfully"
-fi
+
+if [ -d $FORTRAN_PATH/xlf ]; then
+       rm -rf $FORTRAN_PATH/xlf
+else
+       juju-log "Fortran is not installed"
+fi  
+
 
 juju-log "Stop hook completed"