Changeset 4481 for palm/trunk/SCRIPTS


Ignore:
Timestamp:
Mar 31, 2020 6:55:54 PM (4 years ago)
Author:
maronga
Message:

Bugfix for copyright updates in document_changes; copyright update applied to all files

Location:
palm/trunk/SCRIPTS
Files:
24 edited

Legend:

Unmodified
Added
Removed
  • palm/trunk/SCRIPTS/.csd.config.default

    r3668 r4481  
    1515# PALM. If not, see <http://www.gnu.org/licenses/>.
    1616#
    17 # Copyright 1997-2018  Leibniz Universitaet Hannover
     17# Copyright 1997-2020  Leibniz Universitaet Hannover
    1818#--------------------------------------------------------------------------------#
    1919#
  • palm/trunk/SCRIPTS/batch_scp

    r4443 r4481  
    1717# PALM. If not, see <http://www.gnu.org/licenses/>.
    1818#
    19 # Copyright 1997-2018  Leibniz Universitaet Hannover
     19# Copyright 1997-2020  Leibniz Universitaet Hannover
    2020#--------------------------------------------------------------------------------#
    2121#
  • palm/trunk/SCRIPTS/compile_tutorial

    r2718 r4481  
    1515# PALM. If not, see <http://www.gnu.org/licenses/>.
    1616#
    17 # Copyright 1997-2018  Leibniz Universitaet Hannover
     17# Copyright 1997-2020  Leibniz Universitaet Hannover
    1818#--------------------------------------------------------------------------------#
    1919#
  • palm/trunk/SCRIPTS/document_changes

    r4370 r4481  
    2525# -----------------
    2626# $Id$
     27# Bugfix for copyright updates
     28#
     29# 4370 2020-01-10 14:00:44Z raasch
    2730# script made bash compatible
    2831#
     
    204207       done <"$fn"
    205208
    206        
    207        
     209
    208210#
    209211#--    check for updates of the copyright statement
    210        found_update_year=false
    211 
    212212       while read line
    213213       do
     
    216216          line_tmp2=""     
    217217          line_tmp=${line:22:29}
    218           line_tmp2=${line:2:15}
    219          
    220 #           echo "$line_tmp $line_tmp2"
    221          
    222           if  [[ "$line_tmp" == "Leibniz Universitaet Hannover" && "$line_tmp2" == "Copyright 1997-" ]]
    223           then
    224          
    225              year_in_file=${line:17:4}
    226              if  [[ "$year_in_file" != "$current_year" ]]
     218          line_tmp2=${line:2:10}
     219
     220          if  [[ "$line_tmp2" == "Copyright " ]]
     221          then
     222             year_in_file1=${line:12:4}
     223             year_in_file2=${line:17:4}
     224             institution=${line:22}
     225
     226             if  [[ "$year_in_file2" != "$current_year" ]]
    227227             then
    228      
    229228                printf "\r%$(tput cols)s" " "   
    230229                printf "\r  \e[1;33m*** Copyright update required in $fn\e[0m\n"
    231230
    232231                comment_char=${line:0:1}
    233                 found_update_year=true             
    234232                cp $fn $fn~
    235                
     233
     234                (( count_updates = count_updates + 1 ))
     235                sed -i "s/$comment_char Copyright .*$institution/$comment_char Copyright $year_in_file1-$current_year $institution/" $fn
     236
    236237             fi
    237238          fi
    238        
     239
    239240       done <"$fn"
    240          
     241
    241242       printf "\r%$(tput cols)s" " "   
    242243       printf "\r\e[1m  *** Searched files: $count_files. Comments found: $count_changes. Copyright updates found: $count_updates\e[0m"
    243        
     244
    244245#
    245246#--    move comments from current revisions to former revisions
     
    252253#--       remove leading \n characters in string
    253254          comments=${comments:2}
    254  
    255  
    256          
     255
    257256#
    258257#--       fix old time stamp
     
    267266          (( line_stop = line_stop + 2 ))
    268267          sed -i "${line_stop}i$comments" $fn
    269          
     268
    270269
    271270
     
    279278       fi
    280279
    281 #
    282 #--    move comments from current revisions to former revisions
    283        if [[ "$found_update_year" == true ]]
    284        then
    285 
    286           (( count_updates = count_updates + 1 )) 
    287          
    288            sed -i "s/$comment_char Copyright 1997-.*Leibniz Universitaet Hannover/$comment_char Copyright 1997-$current_year Leibniz Universitaet Hannover/" $fn
    289      
    290        fi
    291        
    292280    done
    293281
  • palm/trunk/SCRIPTS/generate_documentation

    r3197 r4481  
    1414# PALM. If not, see <http://www.gnu.org/licenses/>.
    1515#
    16 # Copyright 1997-2018  Leibniz Universitaet Hannover
     16# Copyright 1997-2020  Leibniz Universitaet Hannover
    1717#--------------------------------------------------------------------------------#
    1818#
  • palm/trunk/SCRIPTS/inifor_script

    r3792 r4481  
    1717# PALM. If not, see <http://www.gnu.org/licenses/>.
    1818#
    19 # Copyright 2017-2018  Leibniz Universitaet Hannover
     19# Copyright 2017-2020  Leibniz Universitaet Hannover
    2020#--------------------------------------------------------------------------------#
    2121#
  • palm/trunk/SCRIPTS/palm_csd

    r4311 r4481  
    1515# PALM. If not, see <http://www.gnu.org/licenses/>.
    1616#
    17 # Copyright 1997-2018  Leibniz Universitaet Hannover
     17# Copyright 1997-2020  Leibniz Universitaet Hannover
    1818#--------------------------------------------------------------------------------#
    1919#
  • palm/trunk/SCRIPTS/palm_csd_files/palm_csd_canopy_generator.py

    r4023 r4481  
    1515# PALM. If not, see <http://www.gnu.org/licenses/>.
    1616#
    17 # Copyright 1997-2018  Leibniz Universitaet Hannover
     17# Copyright 1997-2020  Leibniz Universitaet Hannover
    1818#--------------------------------------------------------------------------------#
    1919#
  • palm/trunk/SCRIPTS/palm_csd_files/palm_csd_netcdf_interface.py

    r3944 r4481  
    1515# PALM. If not, see <http://www.gnu.org/licenses/>.
    1616#
    17 # Copyright 1997-2018  Leibniz Universitaet Hannover
     17# Copyright 1997-2020  Leibniz Universitaet Hannover
    1818#--------------------------------------------------------------------------------#
    1919#
  • palm/trunk/SCRIPTS/palm_csd_files/palm_csd_tools.py

    r4250 r4481  
    1515# PALM. If not, see <http://www.gnu.org/licenses/>.
    1616#
    17 # Copyright 1997-2018  Leibniz Universitaet Hannover
     17# Copyright 1997-2020  Leibniz Universitaet Hannover
    1818#--------------------------------------------------------------------------------#
    1919#
  • palm/trunk/SCRIPTS/palm_find_lowest_available_error_number

    r3118 r4481  
    1414# PALM. If not, see <http://www.gnu.org/licenses/>.
    1515#
    16 # Copyright 2018-2018  Leibniz Universitaet Hannover
     16# Copyright 2018-2020  Leibniz Universitaet Hannover
    1717#------------------------------------------------------------------------------#
    1818#
  • palm/trunk/SCRIPTS/palm_find_lowest_available_log_point_index

    r3027 r4481  
    1414# PALM. If not, see <http://www.gnu.org/licenses/>.
    1515#
    16 # Copyright 2018-2018  Leibniz Universitaet Hannover
     16# Copyright 2018-2020  Leibniz Universitaet Hannover
    1717#------------------------------------------------------------------------------#
    1818#
  • palm/trunk/SCRIPTS/palm_gf

    r4393 r4481  
    1515# PALM. If not, see <http://www.gnu.org/licenses/>.
    1616#
    17 # Copyright 1997-2018  Leibniz Universitaet Hannover
     17# Copyright 1997-2020  Leibniz Universitaet Hannover
    1818#--------------------------------------------------------------------------------#
    1919#
  • palm/trunk/SCRIPTS/palm_gf_files/palm_gf_tools.py

    r4393 r4481  
    1515# PALM. If not, see <http://www.gnu.org/licenses/>.
    1616#
    17 # Copyright 1997-2018  Leibniz Universitaet Hannover
     17# Copyright 1997-2020  Leibniz Universitaet Hannover
    1818#--------------------------------------------------------------------------------#
    1919#
  • palm/trunk/SCRIPTS/palm_simple_build

    r2875 r4481  
    1414# PALM. If not, see <http://www.gnu.org/licenses/>.
    1515#
    16 # Copyright 1997-2018  Leibniz Universitaet Hannover
     16# Copyright 1997-2020  Leibniz Universitaet Hannover
    1717#--------------------------------------------------------------------------------#
    1818#
  • palm/trunk/SCRIPTS/palm_simple_run

    r3414 r4481  
    1414# PALM. If not, see <http://www.gnu.org/licenses/>.
    1515#
    16 # Copyright 1997-2018  Leibniz Universitaet Hannover
     16# Copyright 1997-2020  Leibniz Universitaet Hannover
    1717#--------------------------------------------------------------------------------#
    1818#
  • palm/trunk/SCRIPTS/palm_wd

    r4393 r4481  
    1515# PALM. If not, see <http://www.gnu.org/licenses/>.
    1616#
    17 # Copyright 1997-2018  Leibniz Universitaet Hannover
     17# Copyright 1997-2020  Leibniz Universitaet Hannover
    1818#--------------------------------------------------------------------------------#
    1919#
  • palm/trunk/SCRIPTS/palm_wdd

    r2825 r4481  
    1515# PALM. If not, see <http://www.gnu.org/licenses/>.
    1616#
    17 # Copyright 1997-2018  Leibniz Universitaet Hannover
     17# Copyright 1997-2020  Leibniz Universitaet Hannover
    1818#--------------------------------------------------------------------------------#
    1919#
  • palm/trunk/SCRIPTS/palmbuild

    r4303 r4481  
    1717# PALM. If not, see <http://www.gnu.org/licenses/>.
    1818#
    19 # Copyright 2017-2018  Leibniz Universitaet Hannover
     19# Copyright 2017-2020  Leibniz Universitaet Hannover
    2020#------------------------------------------------------------------------------#
    2121#
  • palm/trunk/SCRIPTS/palmplot

    r3202 r4481  
    1414# PALM. If not, see <http://www.gnu.org/licenses/>.
    1515#
    16 # Copyright 1997-2018  Leibniz Universitaet Hannover
     16# Copyright 1997-2020  Leibniz Universitaet Hannover
    1717#--------------------------------------------------------------------------------#
    1818#
  • palm/trunk/SCRIPTS/palmrun

    r4443 r4481  
    1717# PALM. If not, see <http://www.gnu.org/licenses/>.
    1818#
    19 # Copyright 2017-2018  Leibniz Universitaet Hannover
     19# Copyright 2017-2020  Leibniz Universitaet Hannover
    2020#--------------------------------------------------------------------------------#
    2121#
  • palm/trunk/SCRIPTS/palmrungui

    r4470 r4481  
    1515# PALM. If not, see <http://www.gnu.org/licenses/>.
    1616#
    17 # Copyright 1997-2018  Leibniz Universitaet Hannover
     17# Copyright 1997-2020  Leibniz Universitaet Hannover
    1818#--------------------------------------------------------------------------------#
    1919#
     
    2525# -----------------
    2626# $Id$
     27# Bugfixes: - reading history lines discard button caused error message
     28#           - deleting of USER_CODE files did not work
     29#
     30# 4470 2020-03-24 06:52:19Z maronga
    2731# Added file size output, more I/O functionalities, new/removed buttons
    2832#
     
    11121116       opt.exec_()
    11131117
    1114        palmrunline = str(history_entry)
    1115        palmrunline = palmrunline[17:]
    1116        palmrunline = palmrunline[:len(palmrunline)-1]
    1117        palmrunline = filter(None,palmrunline.split("("))[0]
    1118        self.groupBox.findChild(QtGui.QLineEdit,"commandline").setText(palmrunline)
    1119 
    1120 #      Set selected item to jobname in "available jobs" list
    1121        jobname = str(history_entry[17:])
    1122        jobname = filter(None,jobname.split(" -r"))[1]
    1123        jobname = jobname.strip()
    1124        jobname = filter(None,jobname.split(" "))[0]
    1125        jobname = jobname.replace("\"","")
    1126        item2int = self.list_jobs.findItems(jobname,QtCore.Qt.MatchCaseSensitive)
    1127 
    1128        if ( item2int != [] ):
    1129           self.list_jobs.setCurrentItem(item2int[0])
    1130           self.update_input()
    1131 
    1132 #      Add tooltip tag
    1133        tag = str(history_entry).split('\n')[0]
    1134        tag = filter(None,tag.split("("))[1]
    1135        tag = tag.replace(")","")
    1136        self.groupBox.findChild(QtGui.QLineEdit,"line_tag").setText(tag)
     1118       if ( history_entry != "" ):
     1119          palmrunline = str(history_entry)
     1120          palmrunline = palmrunline[17:]
     1121          palmrunline = palmrunline[:len(palmrunline)-1]
     1122          palmrunline = filter(None,palmrunline.split("("))[0]
     1123          self.groupBox.findChild(QtGui.QLineEdit,"commandline").setText(palmrunline)
     1124
     1125#         Set selected item to jobname in "available jobs" list
     1126          jobname = str(history_entry[17:])
     1127          jobname = filter(None,jobname.split(" -r"))[1]
     1128          jobname = jobname.strip()
     1129          jobname = filter(None,jobname.split(" "))[0]
     1130          jobname = jobname.replace("\"","")
     1131          item2int = self.list_jobs.findItems(jobname,QtCore.Qt.MatchCaseSensitive)
     1132
     1133          if ( item2int != [] ):
     1134             self.list_jobs.setCurrentItem(item2int[0])
     1135             self.update_input()
     1136
     1137#         Add tooltip tag
     1138          tag = str(history_entry).split('\n')[0]
     1139          tag = filter(None,tag.split("("))[1]
     1140          tag = tag.replace(")","")
     1141          self.groupBox.findChild(QtGui.QLineEdit,"line_tag").setText(tag)
    11371142 
    1138 #      Process palmrungui to set up gui controls
    1139        self.setup_gui(palmrunline)
     1143#         Process palmrungui to set up gui controls
     1144          self.setup_gui(palmrunline)
    11401145
    11411146
     
    16061611          sel_files = self.list_user.selectedItems()
    16071612
    1608           input_dir = job_dir + "/" + sel_job + "/USER/"
     1613          input_dir = job_dir + "/" + sel_job + "/USER_CODE/"
    16091614
    16101615          for i in range(0,len(sel_files)):
     
    17451750    def DiscardHistory(self):
    17461751
    1747 
     1752       global history_entry
     1753       history_entry = ""
    17481754       self.close()
    17491755
  • palm/trunk/SCRIPTS/process_dvr_output

    r2718 r4481  
    1414# PALM. If not, see <http://www.gnu.org/licenses/>.
    1515#
    16 # Copyright 1997-2018  Leibniz Universitaet Hannover
     16# Copyright 1997-2020  Leibniz Universitaet Hannover
    1717#--------------------------------------------------------------------------------#
    1818#
  • palm/trunk/SCRIPTS/release_tutorial

    r2718 r4481  
    1414# PALM. If not, see <http://www.gnu.org/licenses/>.
    1515#
    16 # Copyright 1997-2018  Leibniz Universitaet Hannover
     16# Copyright 1997-2020  Leibniz Universitaet Hannover
    1717#--------------------------------------------------------------------------------#
    1818#
Note: See TracChangeset for help on using the changeset viewer.