Исправил остатки слияния веток

revert Обновить .gitea/workflows/build.yml

TEst actions

.gitea/workflows/build.yml

@@ -3,11 +3,10 @@ run-name: ${{ gitea.actor }} build projman packages
 on: [push]
 
 jobs:
-  Explore-Gitea-Actions:
+  Projman-Build:
-    runs-on: ubuntu-latest
+    runs-on: tcl-tk-builder:docker://svk28/tcltk-build-debian:latest
     steps:
-    build:
+      - name: Checkout repository
-      image: svk28/tcltk-build-debian:latest
+        uses: actions/checkout@v4
-      commands:
+      - run: cd debian
-        - cd debian
+      - run: ./build-deb-projman.sh
-        - ./build-deb-projman.sh

lib/files.tcl

@@ -31,6 +31,7 @@ namespace eval FileOper {
 
         # lappend cmd $activeProject
         lappend cmd $fileFullPath
+        # puts $cmd
         catch $cmd pipe
         # puts $pipe
         if [regexp -nocase -- {(\w+)/([\w\-_\.]+); charset=([[:alnum:]-]+)} $pipe m fType fExt fCharset] {
@@ -43,12 +44,15 @@ namespace eval FileOper {
                 }
             }
         }
+        # линуксовый file не всегда корректно определяет тип файла
+        # используем пакет из tcl
+        lassign [::fileutil::fileType $fileFullPath] fType fBinaryType fBinaryInterp
+        puts "File type is $fType, $fBinaryType, $fBinaryInterp"
+
         switch $fType {
-            "application" {
+            "binary" {
-                if {$fExt ne "json"} {
                 return false
             }
-            }
             "text" {
                 return text
             }
@@ -393,7 +397,7 @@ namespace eval FileOper {
         if {[file exists $fileFullPath] == 0} {
             return false
         } else {
-            # puts [::fileutil::magic::filetype $fileFullPath]
+            puts "$fileFullPath File type [::fileutil::magic::filetype $fileFullPath]"
             set fileType [FileOper::GetFileMimeType $fileFullPath]
         }
         switch $fileType {

lib/lexers.tcl

@@ -20,6 +20,7 @@ dict set lexers GO commentMultilineSymbolEnd {*/}
 dict set lexers GO procFindString {func.*?PROCNAME}
 dict set lexers GO procRegexpCommand {regexp -nocase -all -- {\s*?func\s*?(\(\w+\s*?\**?\w+\)|)\s*?(\w+)\((.*?)\)\s+?([a-zA-Z0-9\{\}\[\]\(\)-_.]*?|)\s*?\{} $line match linkName procName params returns}
 dict set lexers GO varRegexpCommand {regexp -nocase -all -line -- {^\s*?var\s+([a-zA-Z0-9\-_$]+)\s+(.+?)(\s*$)} $line match varName varType lineEnd}
+
 #--------------------------------------------------
 # SHELL (Bash)
 dict set lexers SH commentSymbol {#}
@@ -43,6 +44,7 @@ dict set lexers RB tabSize 2
 dict set lexers RB procFindString {(def |class )\s*?PROCNAME}
 dict set lexers RB procRegexpCommand {regexp -nocase -all -- {^\s*?(def|class)\s([a-zA-Z0-9\-_:\?]+?)($|\s|\(.+?\))} $line match keyWord procName params}
 dict set lexers RB varRegexpCommand {regexp -nocase -all -line -- {^\s*?(\w+)\s*=\s*(.+)($)} $line match varName varValue lineEnd}
+
 #--------------------------------------------------
 # YAML (ansible)
 dict set lexers YML commentSymbol {#}
@@ -95,6 +97,8 @@ dict set lexers HTM tabSize 4
 dict set lexers HTM procFindString {<h[0-9]>(<.+>|)PROCNAME(</.+>|)</h[0-9]>}
 dict set lexers HTM procRegexpCommand {regexp -nocase -all -- {<h[0-9]>(<.+>|)(.+?)(</.+>|)</h[0-9]>} $line match v1 procName v2}
 
+#--------------------------------------------------
+# LUA
 dict set lexers LUA commentSymbol {--}
 dict set lexers LUA procFindString {function\s*?PROCNAME}
 dict set lexers LUA procRegexpCommand {regexp -nocase -all -- {^(local|)\s*?(function)\s([a-zA-Z0-9\-_:]+?)\s+\((.+?)\)} $line match v1 keyWord procName params}

projman.tcl

@@ -10,7 +10,7 @@ exec wish "$0" -- "$@"
 ######################################################
 # Version: 2.0.0
 # Release: alpha
-# Build: 30072023112719
+# Build: 17052024104440
 ######################################################
 
 # определим текущую версию, релиз и т.д.