mirror of
				https://github.com/fspc/gbootroot.git
				synced 2025-10-31 15:45:36 -04:00 
			
		
		
		
	Got rid of the \.yard suffix rule, though template needs to be ^\w+, I
never really documented this, and it may trick users who aren't aware of the rule.
This commit is contained in:
		
							parent
							
								
									39e317bccb
								
							
						
					
					
						commit
						6d4c8ead9d
					
				
							
								
								
									
										11
									
								
								gbootroot
									
									
									
									
									
								
							
							
						
						
									
										11
									
								
								gbootroot
									
									
									
									
									
								
							| @ -525,7 +525,10 @@ if (!-e "$home_uml_kernel/.options") { | |||||||
| home_builder($template_dir); | home_builder($template_dir); | ||||||
| if ( -d $global_yard_templates ) { | if ( -d $global_yard_templates ) { | ||||||
|     opendir(DIR,$global_yard_templates) if -d $template_dir; |     opendir(DIR,$global_yard_templates) if -d $template_dir; | ||||||
|     my @templates = grep { m,\.yard$, } readdir(DIR);  |     # I decided this may be too restrictive, besides, everything | ||||||
|  |     # is kept in its own directory. | ||||||
|  |     #my @templates = grep { m,\.yard$, } readdir(DIR);  | ||||||
|  |     my @templates = grep { m,^\w+, } readdir(DIR);  | ||||||
|     closedir(DIR); |     closedir(DIR); | ||||||
|     foreach ( @templates ) { |     foreach ( @templates ) { | ||||||
| 	if (!-e "$template_dir/$_" && !-l "$template_dir/$_") { | 	if (!-e "$template_dir/$_" && !-l "$template_dir/$_") { | ||||||
| @ -1310,7 +1313,8 @@ sub advanced_root_section { | |||||||
| 			       $ear4->set_text("yard");  | 			       $ear4->set_text("yard");  | ||||||
| 			       $entry_advanced[6] = $ear4->get_text(); | 			       $entry_advanced[6] = $ear4->get_text(); | ||||||
| 			       opendir(DIR,$template_dir) if -d $template_dir; | 			       opendir(DIR,$template_dir) if -d $template_dir; | ||||||
| 			       @strings = grep { m,\.yard$, } readdir(DIR);  | 			       #@strings = grep { m,\.yard$, } readdir(DIR);  | ||||||
|  | 			       @strings = grep { m,^\w+, } readdir(DIR);  | ||||||
| 			       closedir(DIR); | 			       closedir(DIR); | ||||||
| 	                 $main::combo->set_popdown_strings( @strings ) if @strings;  | 	                 $main::combo->set_popdown_strings( @strings ) if @strings;  | ||||||
| 			        } ); | 			        } ); | ||||||
| @ -1318,7 +1322,8 @@ sub advanced_root_section { | |||||||
|        $ear4->set_text($entry_advanced[6]) if $entry_advanced[6]; |        $ear4->set_text($entry_advanced[6]) if $entry_advanced[6]; | ||||||
|        if ($yard) { |        if ($yard) { | ||||||
| 	   opendir(DIR,$template_dir) if -d $template_dir;  | 	   opendir(DIR,$template_dir) if -d $template_dir;  | ||||||
| 	   @strings = grep { m,\.yard$, } readdir(DIR) if $yard; | 	   #@strings = grep { m,\.yard$, } readdir(DIR) if $yard; | ||||||
|  | 	   @strings = grep { m,^\w+, } readdir(DIR) if $yard; | ||||||
| 	   closedir(DIR) | 	   closedir(DIR) | ||||||
|        } |        } | ||||||
| 
 | 
 | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user