diff --git a/CHANGELOG.md b/CHANGELOG.md index b1b8750..087d428 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Fixed +- Fixed issue with `movestat` which only allowed single-month seasons + ### Removed - Removed detection of OS at NCCS as it is all SLES15 now diff --git a/plots/movestat b/plots/movestat index 28da0ff..68bf1c9 100755 --- a/plots/movestat +++ b/plots/movestat @@ -32,7 +32,7 @@ else # Interactive Job # ------------------------------------ if(! -e ~/.WEBSERVER ) then SERVER: - set server = NULL + set server = NULL echo " " echo "Enter WEB Server to use: train" echo " polar" @@ -173,9 +173,7 @@ echo " " if( $season == 'NULL' ) then set files = `/bin/ls -1 *stats*gif` set fname = `echo $files[1] | cut -d. -f1` - set fsize = `echo $fname | awk '{print length($0)}'` - @ fsize = $fsize - 2 - set season = `echo $fname | cut -b${fsize}-` + set season = `echo $fname | sed 's/.*_//g'` endif ssh $webid@${server} mkdir -p ${www}/${webdir}/${season}/corcmp echo Syncing ${season} Files from $pltdir/corcmp to $webid@${server}:${www}/${webdir}/${season}/corcmp @@ -190,9 +188,7 @@ echo " " if( $season == 'NULL' ) then set files = `/bin/ls -1 *stats*gif` set fname = `echo $files[1] | cut -d. -f1` - set fsize = `echo $fname | awk '{print length($0)}'` - @ fsize = $fsize - 2 - set season = `echo $fname | cut -b${fsize}-` + set season = `echo $fname | sed 's/.*_//g'` endif ssh $webid@${server} mkdir -p ${www}/${webdir}/${season}/$DSC echo Syncing ${season} Files from $pltdir/$DSC to $webid@${server}:${www}/${webdir}/${season}/$DSC @@ -210,9 +206,7 @@ echo " " if( $season == 'NULL' ) then set files = `/bin/ls -1 *stats*gif` set fname = `echo $files[1] | cut -d. -f1` - set fsize = `echo $fname | awk '{print length($0)}'` - @ fsize = $fsize - 2 - set season = `echo $fname | cut -b${fsize}-` + set season = `echo $fname | sed 's/.*_//g'` endif ssh $webid@${server} mkdir -p ${www}/${webdir}/${season}/$DSCS[1].$DSC