Fixed get os version in SHELL

Signed-off-by: Maxim Logaev <maxlogaev@proton.me>

.editorconfig

@@ -1,21 +0,0 @@
-# https://EditorConfig.org
-
-root = true
-
-[*]
-# charset = utf-8 # not system wide, just in the kernel
-indent_style = space
-indent_size = 4
-trim_trailing_whitespace = true
-end_of_line = lf
-insert_final_newline = true
-
-[*.{asm,inc}]
-indent_size = 8
-
-[kernel/**.{asm,inc}]
-charset = utf-8
-
-[*.{bat,cmd}]
-# Prefer Windows line endings
-end_of_line = crlf

.gitignore

@@ -1,9 +0,0 @@
-### Windows ###
-Thumbs.db
-Thumbs.db:encryptable
-ehthumbs.db
-ehthumbs_vista.db
-
-### macOS ###
-.DS_Store
-._*

contrib/other/jumpnbump/Tupfile.lua

@@ -4,15 +4,14 @@ tup.include(HELPERDIR .. "/use_gcc.lua")
 tup.include(HELPERDIR .. "/use_newlib.lua")
 tup.include(HELPERDIR .. "/use_sdl_newlib.lua")
 
-SDK_DIR_CWD = tup.getcwd() .. "/../../sdk"
-SDK_DIR_VAR = tup.getvariantdir() .. "/../../sdk"
+SDK_DIR = "../../sdk"
 
 CFLAGS = CFLAGS .. " -Dstricmp=strcasecmp -DZLIB_SUPPORT -Dstrnicmp=strncasecmp -DUSE_SDL -DNDEBUG -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32"
-INCLUDES = INCLUDES .. " -I. -I " .. SDK_DIR_CWD .. "/sources/zlib"
-LDFLAGS = LDFLAGS .. " -L" .. tup.getvariantdir() .. "/sdl --subsystem native"
+INCLUDES = INCLUDES .. " -I. -I " .. SDK_DIR .. "/sources/zlib"
+LDFLAGS = LDFLAGS .. " -Lsdl --subsystem native"
 LIBS = "-ls -lz.dll " .. LIBS
 
-table.insert(LIBDEPS, SDK_DIR_VAR .. "/lib/<libz.dll.a>")
+table.insert(LIBDEPS, SDK_DIR .. "/lib/<libz.dll.a>")
 table.insert(LIBDEPS, "sdl/<libs>")
 
 compile_gcc{"filter.c", "fireworks.c", "main.c", "menu.c", "stub.c"}

contrib/other/udcli/Tupfile.lua

@@ -3,7 +3,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../programs" or tup.ge
 tup.include(HELPERDIR .. "/use_gcc.lua")
 tup.include(HELPERDIR .. "/use_newlib.lua")
 
-LDFLAGS = LDFLAGS .. " -L" .. tup.getvariantdir() .. "/libudis86"
+LDFLAGS = LDFLAGS .. " -Llibudis86"
 LIBS = "-ludis86 " .. LIBS
 table.insert(LIBDEPS, "libudis86/<libudis86>")
 INCLUDES = INCLUDES .. " -Ilibudis86"

contrib/sdk/sources/SDL-1.2.2_newlib/src/Tupfile.lua

@@ -28,7 +28,7 @@ FOLDERS = {
 for i,v in ipairs(FOLDERS) do
   compile_gcc(v .. "*.c", v .. "%B.o")
   tup.append_table(OBJS,
-    tup.foreach_rule(v .. "*.asm", "nasm -f coff -Ihermes/ -o %o %f", v .. "%B.o")
+    tup.foreach_rule(v .. "*.asm", "nasm -f coff -Ihermes -o %o %f", v .. "%B.o")
   )
 end
 tup.rule(OBJS, "kos32-ar rcs %o %f", {"../../../lib/libSDLn.a", "../../../lib/<libSDLn>"})

contrib/sdk/sources/newlib/libc/Tupfile.lua

@@ -1,6 +1,6 @@
 if tup.getconfig("NO_GCC") ~= "" or tup.getconfig("NO_FASM") ~= "" then return end
 tup.include("../../../../../programs/use_gcc.lua")
-SDK_DIR = tup.getvariantdir() .. "/../../.."
+SDK_DIR = "../../.."
 CFLAGS =  "-c -O2 -fno-builtin -fno-ident -fomit-frame-pointer -DMISSING_SYSCALL_NAMES"
 LDFLAGS = "-shared -s -T libcdll.lds --out-implib " .. SDK_DIR .. "/lib/libc.dll.a --image-base 0"
 -- LDFLAGS = LDFLAGS .. " --output-def libc.orig.def"

contrib/sdk/sources/newlib/libc/include/sys/ksys.h

@@ -406,7 +406,7 @@ KOSAPI int __strcmp(const char* s1, const char* s2)
 }
 
 /* ####################################################################### */
-/* ############### С wrappers for system calls KolibriOS ################# */
+/* ############### С wrappers for system calls Kolibri OS ################ */
 /* ####################################################################### */
 
 /*=============== Function -1 - terminate thread/process ===============*/

contrib/sdk/sources/sqlite3/Tupfile.lua

@@ -3,9 +3,7 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../../programs" or tup
 tup.include(HELPERDIR .. "/use_gcc.lua")
 tup.include(HELPERDIR .. "/use_newlib.lua")
 
-VAR_LIB = tup.getvariantdir() .. "/../../lib"
-
-LDFLAGS = " -shared -s -T dll.lds --entry _DllStartup --image-base=0 --out-implib " .. VAR_LIB .. "/libsqlite3.dll.a -L" .. VAR_LIB
+LDFLAGS = " -shared -s -T dll.lds --entry _DllStartup --image-base=0 --out-implib ../../lib/libsqlite3.dll.a -L../../lib "
 
 CFLAGS = CFLAGS .. " -U__MINGW32__ -UWIN32 -UWindows -U_WINDOWS -U_WIN32 -U__WIN32__ -U_WIN32 -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.36.0\" -DPACKAGE_STRING=\"sqlite-3.36.0\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.36.0\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=0 -DHAVE_DLFCN_H=0  -DHAVE_FDATASYNC=0 -DHAVE_USLEEP=0 -DHAVE_LOCALTIME_R=1 -DHAVE_GMTIME_R=1 -DHAVE_DECL_STRERROR_R=1 -DHAVE_STRERROR_R=1 -DHAVE_EDITLINE_READLINE_H=1 -DHAVE_EDITLINE=1 -DHAVE_ZLIB_H=1 -I. -D_REENTRANT=1 -DSQLITE_THREADSAFE=0 -DSQLITE_ENABLE_MATH_FUNCTIONS -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5 -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_GEOPOLY -DSQLITE_HAVE_ZLIB=1 -DSQLITE_OS_OTHER=1 -USQLITE_OS_WIN_H -DSQLITE_TEMP_STORE=3 -D_NO_STDERR "
 
@@ -14,5 +12,5 @@ compile_gcc{"sqlite3.c", "kolibri_vfs.c"}
 
 OBJS.extra_inputs = {"../../lib/<libc.dll.a>", "../../lib/<libdll.a>"}
 
-tup.rule(OBJS, "kos32-ld sqlite3.def" .. LDFLAGS ..  " -o %o %f -lgcc -lc.dll -ldll " .. tup.getconfig("KPACK_CMD"),
+tup.rule(OBJS, "kos32-ld sqlite3.def" .. LDFLAGS ..  "-o %o %f -lgcc -lc.dll -ldll " .. tup.getconfig("KPACK_CMD"),
   {"../../bin/sqlite3.dll", extra_outputs = {"../../lib/libsqlite3.dll.a", "../../lib/<libsqlite3.dll.a>"}})

contrib/sdk/sources/sqlite3/shell/Tupfile.lua

@@ -6,14 +6,14 @@ end
 tup.include(HELPERDIR .. "/use_gcc.lua")
 tup.include(HELPERDIR .. "/use_newlib.lua")
 
-INCLUDES += " -I .. "
+INCLUDES= INCLUDES .. " -I .. "
 
-CFLAGS += " -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -DSQLITE_OS_OTHER=1 -DHAVE_UNISTD_H=0 -D_NO_STDERR -DSQLITE_OMIT_POPEN -DSQLITE_THREADSAFE=0 -D_KOLIBRI -DSQLITE_OMIT_VIRTUALTABLE -U__linux__ -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.36.0\" -DPACKAGE_STRING=\"sqlite-3.36.0\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.36.0\""
+CFLAGS = CFLAGS .. " -U__WIN32__ -U_Win32 -U_WIN32 -U__MINGW32__ -UWIN32 -DSQLITE_OS_OTHER=1 -DHAVE_UNISTD_H=0 -D_NO_STDERR -DSQLITE_OMIT_POPEN -DSQLITE_THREADSAFE=0 -D_KOLIBRI -DSQLITE_OMIT_VIRTUALTABLE -U__linux__ -DPACKAGE_NAME=\"sqlite\" -DPACKAGE_TARNAME=\"sqlite\" -DPACKAGE_VERSION=\"3.36.0\" -DPACKAGE_STRING=\"sqlite-3.36.0\" -DPACKAGE=\"sqlite\" -DVERSION=\"3.36.0\""
 
-LDFLAGS += " --subsystem console "
+LDFLAGS = LDFLAGS .. " --subsystem console "
 
-table.insert(LIBDEPS, "../../../lib/<libsqlite3.dll.a>")
-LIBS += " -L" .. tup.getvariantdir() .. "/../../../lib -lsqlite3.dll"
+table.insert(LIBDEPS,"../../../lib/<libsqlite3.dll.a>")
+LIBS = LIBS .. " -lsqlite3.dll" 
 
 -- Compile --
 compile_gcc{ 
@@ -22,3 +22,6 @@ compile_gcc{
 
 -- Link --
 link_gcc("sqlite3")
+
+
+ 

contrib/sdk/sources/zlib/Tupfile.lua

@@ -3,15 +3,14 @@ HELPERDIR = (tup.getconfig("HELPERDIR") == "") and "../../../../programs" or tup
 tup.include(HELPERDIR .. "/use_gcc.lua")
 tup.include(HELPERDIR .. "/use_newlib.lua")
 
-VAR_LIB = tup.getvariantdir() .. "/../../lib"
-
-LDFLAGS = " -shared -s -T dll.lds --entry _DllStartup --image-base=0 --out-implib " .. VAR_LIB .. "/libz.dll.a -L" .. VAR_LIB
+LDFLAGS = " -shared -s -T dll.lds --entry _DllStartup --image-base=0 --out-implib ../../lib/libz.dll.a -L../../lib "
 
 CFLAGS = CFLAGS .. " -DHAVE_UNISTD_H -U_Win32 -U_WIN32 -U__MINGW32__"
 
 compile_gcc{"adler32.c", "compress.c", "crc32.c", "deflate.c", "gzclose.c", "gzlib.c", "gzread.c", "gzwrite.c", "infback.c", "inffast.c", "inflate.c", "inftrees.c", "trees.c", "uncompr.c", "zutil.c"}
+--tup.rule(OBJS, "kos32-ar rcs %o %f", {"../../lib/libz.a", "../../lib/<libz>"})
 
 OBJS.extra_inputs = {"../../lib/<libc.dll.a>", "../../lib/<libdll.a>"}
 
-tup.rule(OBJS, "kos32-ld zlib.def " .. LDFLAGS ..  " -o %o %f -lgcc -lc.dll -ldll " .. tup.getconfig("KPACK_CMD"),
+tup.rule(OBJS, "kos32-ld zlib.def" .. LDFLAGS ..  "-o %o %f -lgcc -lc.dll -ldll " .. tup.getconfig("KPACK_CMD"),
   {"../../bin/libz.dll", extra_outputs = {"../../lib/libz.dll.a", "../../lib/<libz.dll.a>"}})

data/ca/lang.inc

@@ -0,0 +1 @@
+lang fix ca

data/ca/settings/kolibri.lbl

@@ -1,7 +1,7 @@
 KolibriOS
 version 0770
 svnr 4483
-language ca_ES
+language ca
 
 ;just comment
 ; Hi, curious person! :-)

data/ca_ES/lang.inc

@@ -1 +0,0 @@
-lang fix ca_ES

data/common/templates/shell_misc.sh

@@ -7,7 +7,7 @@ sleep 200
 
 echo 
 echo ==============
-echo running palitra
+echo runing palitra
 echo ==============
 
 /sys/media/palitra H 00AEC3D8 003A95BF
@@ -20,7 +20,7 @@ sleep 200
 
 echo 
 echo ==============
-echo running fillscr
+echo runing fillscr
 echo ==============
 
 /sys/media/fillscr 105,145,200, 105,145,200, 105,145,200, 60,60,128, 82,102,164, 60,60,128, 60,60,128, 60,60,128, 60,60,128
@@ -29,7 +29,7 @@ sleep 200
 
 echo 
 echo ==============
-echo running @notify
+echo runing @notify
 echo ==============
 
 /sys/@notify "Hello, I am a @notify app!"

data/en_US/lang.inc

@@ -1 +0,0 @@
-lang fix en_US