Force lex scan to skip intial panel etc, also check in copylex for missing dir in output
This commit is contained in:
		
							
								
								
									
										24
									
								
								copylex.sh
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								copylex.sh
									
									
									
									
									
								
							@@ -23,7 +23,16 @@ if [[ ! "$MODULE_NAME" =~ ^[A-Z] ]]; then
 | 
				
			|||||||
    usage
 | 
					    usage
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# Check if directory exists
 | 
					# Check if directory exists in output
 | 
				
			||||||
 | 
					OUTPUT_SRC_DIR=~/clients/SM2/SM2Gen/venv/output
 | 
				
			||||||
 | 
					OUTPUT_MODULE_DIR="${OUTPUT_SRC_DIR}/${MODULE_NAME}"
 | 
				
			||||||
 | 
					if [ ! -d "$OUTPUT_MODULE_DIR" ]; then
 | 
				
			||||||
 | 
					    echo "Error: Directory '${OUTPUT_MODULE_DIR}' does not exist."
 | 
				
			||||||
 | 
					    exit 1
 | 
				
			||||||
 | 
					    #usage
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Check if directory exists in SME11
 | 
				
			||||||
SRC_DIR=~/SME11/usr/share/smanager/lib/SrvMngr/I18N/Modules
 | 
					SRC_DIR=~/SME11/usr/share/smanager/lib/SrvMngr/I18N/Modules
 | 
				
			||||||
MODULE_DIR="${SRC_DIR}/${MODULE_NAME}"
 | 
					MODULE_DIR="${SRC_DIR}/${MODULE_NAME}"
 | 
				
			||||||
if [ ! -d "$MODULE_DIR" ]; then
 | 
					if [ ! -d "$MODULE_DIR" ]; then
 | 
				
			||||||
@@ -37,7 +46,18 @@ MODULE_NAME_LC=$(echo "$MODULE_NAME" | tr '[:upper:]' '[:lower:]')
 | 
				
			|||||||
# Paths
 | 
					# Paths
 | 
				
			||||||
LEX_FILE="${MODULE_DIR}/${MODULE_NAME_LC}_en.lex"
 | 
					LEX_FILE="${MODULE_DIR}/${MODULE_NAME_LC}_en.lex"
 | 
				
			||||||
BAK_FILE="${LEX_FILE}.bak"
 | 
					BAK_FILE="${LEX_FILE}.bak"
 | 
				
			||||||
NEW_LEX_FILE="output/${MODULE_NAME}/${MODULE_NAME_LC}_en.lex.new1"
 | 
					
 | 
				
			||||||
 | 
					# Define file paths
 | 
				
			||||||
 | 
					LEX_FILE_NEW1="output/${MODULE_NAME}/${MODULE_NAME_LC}_en.lex.new1"
 | 
				
			||||||
 | 
					LEX_FILE_NEW="output/${MODULE_NAME}/${MODULE_NAME_LC}_en.lex.new"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					# Check if 'new1' version exists; if not, fall back to 'new'
 | 
				
			||||||
 | 
					if [ -f "$LEX_FILE_NEW1" ]; then
 | 
				
			||||||
 | 
					  NEW_LEX_FILE="$LEX_FILE_NEW1"
 | 
				
			||||||
 | 
					else
 | 
				
			||||||
 | 
					  NEW_LEX_FILE="$LEX_FILE_NEW"
 | 
				
			||||||
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
GENERAL_LEX_FILE="${SRC_DIR}/General/general_en.lex"
 | 
					GENERAL_LEX_FILE="${SRC_DIR}/General/general_en.lex"
 | 
				
			||||||
GENERAL_BAK_FILE="${GENERAL_LEX_FILE}.bak"
 | 
					GENERAL_BAK_FILE="${GENERAL_LEX_FILE}.bak"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -444,6 +444,10 @@ def main():
 | 
				
			|||||||
	do_lang = args.lang
 | 
						do_lang = args.lang
 | 
				
			||||||
	do_audit = args.audit
 | 
						do_audit = args.audit
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
 | 
						if panel in ['Support','Manual','Initial','Legacypanel','Roundcubepanel','Module','Request','Swttheme','','','','','','','','','']:
 | 
				
			||||||
 | 
							logger.warning(f"Skipping {panel}")
 | 
				
			||||||
 | 
							quit(0)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	logger.info(f"Lex scan for panel: {panel}, system: {system} audit: {do_audit} One word audit: {edit_files} Other lang: {do_lang}")
 | 
						logger.info(f"Lex scan for panel: {panel}, system: {system} audit: {do_audit} One word audit: {edit_files} Other lang: {do_lang}")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user