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

[sunitha]

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

47. By sunitha on 2015-08-27

IBM XL FORTRAN final code check in

[vsr (vsasi)]

review: Approve

=== modified file 'config.yaml'
--- config.yaml	2015-08-26 09:41:37 +0000
+++ config.yaml	2015-08-27 04:21:04 +0000
@@ -5,29 +5,24 @@
      description: |
         Download url for XL Fortran packages
   xlfortran_package_name:
-    type: string
-    default: ""   
-    description: |
+     type: string
+     default: ""   
+     description: |
         XL Fortran package name
   accept-ibm-xlfortran-license:
-    type: boolean
-    default: False
-    description: |
+     type: boolean
+     default: False
+     description: |
         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 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"
-    description: |
-        Target installation directory for the IBM XL FORTRAN
   sha_fortran:
-    type: string
-    default: ""
-    description: |
+     type: string
+     default: ""
+     description: |
         Checksum value to check integrity of IBM XL Fortran. The Charm uses
         sha1sum to check the integrity. For example, run the command:
         <sha1sum IBM_XL_FORTRAN_V15.1.2.0_LINUX_EVAL.tar.gz | cut -d " " -f1>
 
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2015-08-26 08:27:30 +0000
+++ hooks/config-changed	2015-08-27 04:21:04 +0000
@@ -2,7 +2,7 @@
 # config-changed occurs everytime a new configuration value is updated (juju set)
 set -e
 ARCHIVE_DIR=$CHARM_DIR/files/archives
-FORTRAN_INSTALL_PATH=`config-get fortran_path_name`
+FORTRAN_INSTALL_PATH=/opt/ibm
 
 
 #Check Fortran is installed or not
 
=== modified file 'hooks/stop'
--- hooks/stop	2015-08-26 09:38:02 +0000
+++ hooks/stop	2015-08-27 04:21:04 +0000
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 juju-log "IBM XL Fortran: starting stop hook"
-FORTRAN_PATH=$(config-get fortran_path_name)
+FORTRAN_PATH=/opt/ibm
 
 if [ -d $FORTRAN_PATH/xlf ]; then
        rm -rf $FORTRAN_PATH/xlf