KolibriOS/kolibrios
12
4
Fork 12
Code Issues 78 Pull Requests 5 Projects Releases Activity

Shell 0.7.2. 1) .shell moved to /sys/settings. 2) "cd .." command fixed.

Browse Source 
git-svn-id: svn://kolibrios.org@4106 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
Albom 2013-10-26 18:53:48 +00:00
parent 1e36f2a2c8
commit 306b448222
9 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/eng/Makefile
View File

@ -261,7 +261,7 @@ COPY_FILES:=\
games/soko-8.lev:GAMES/SOKO-8.LEV:$(PROGS)/games/soko/trunk/SOKO-8.LEV \ games/soko-8.lev:GAMES/SOKO-8.LEV:$(PROGS)/games/soko/trunk/SOKO-8.LEV \
games/soko-9.lev:GAMES/SOKO-9.LEV:$(PROGS)/games/soko/trunk/SOKO-9.LEV \ games/soko-9.lev:GAMES/SOKO-9.LEV:$(PROGS)/games/soko/trunk/SOKO-9.LEV \
media/kiv.ini:MEDIA/KIV.INI:$(PROGS)/media/kiv/trunk/kiv.ini \ media/kiv.ini:MEDIA/KIV.INI:$(PROGS)/media/kiv/trunk/kiv.ini \
.shell:.shell:$(PROGS)/system/shell/bin/eng/.shell \ settings/.shell:SETTINGS/.shell:$(PROGS)/system/shell/bin/eng/.shell \
settings/mykey.ini:SETTINGS/MYKEY.INI:$(PROGS)/system/MyKey/trunk/mykey.ini \ settings/mykey.ini:SETTINGS/MYKEY.INI:$(PROGS)/system/MyKey/trunk/mykey.ini \
example.asm:EXAMPLE.ASM:$(PROGS)/develop/examples/example/trunk/example.asm \ example.asm:EXAMPLE.ASM:$(PROGS)/develop/examples/example/trunk/example.asm \
# end of list # end of list

2
data/et/Makefile
View File

@ -261,7 +261,7 @@ COPY_FILES:=\
games/soko-8.lev:GAMES/SOKO-8.LEV:$(PROGS)/games/soko/trunk/SOKO-8.LEV \ games/soko-8.lev:GAMES/SOKO-8.LEV:$(PROGS)/games/soko/trunk/SOKO-8.LEV \
games/soko-9.lev:GAMES/SOKO-9.LEV:$(PROGS)/games/soko/trunk/SOKO-9.LEV \ games/soko-9.lev:GAMES/SOKO-9.LEV:$(PROGS)/games/soko/trunk/SOKO-9.LEV \
media/kiv.ini:MEDIA/KIV.INI:$(PROGS)/media/kiv/trunk/kiv.ini \ media/kiv.ini:MEDIA/KIV.INI:$(PROGS)/media/kiv/trunk/kiv.ini \
.shell:.shell:$(PROGS)/system/shell/bin/eng/.shell \ settings/.shell:SETTINGS/.shell:$(PROGS)/system/shell/bin/eng/.shell \
settings/mykey.ini:SETTINGS/MYKEY.INI:$(PROGS)/system/MyKey/trunk/mykey.ini \ settings/mykey.ini:SETTINGS/MYKEY.INI:$(PROGS)/system/MyKey/trunk/mykey.ini \
example.asm:EXAMPLE.ASM:$(PROGS)/develop/examples/example/trunk/example.asm \ example.asm:EXAMPLE.ASM:$(PROGS)/develop/examples/example/trunk/example.asm \
# end of list # end of list

2
data/it/Makefile
View File

@ -261,7 +261,7 @@ COPY_FILES:=\
games/soko-8.lev:GAMES/SOKO-8.LEV:$(PROGS)/games/soko/trunk/SOKO-8.LEV \ games/soko-8.lev:GAMES/SOKO-8.LEV:$(PROGS)/games/soko/trunk/SOKO-8.LEV \
games/soko-9.lev:GAMES/SOKO-9.LEV:$(PROGS)/games/soko/trunk/SOKO-9.LEV \ games/soko-9.lev:GAMES/SOKO-9.LEV:$(PROGS)/games/soko/trunk/SOKO-9.LEV \
media/kiv.ini:MEDIA/KIV.INI:$(PROGS)/media/kiv/trunk/kiv.ini \ media/kiv.ini:MEDIA/KIV.INI:$(PROGS)/media/kiv/trunk/kiv.ini \
.shell:.shell:$(PROGS)/system/shell/bin/eng/.shell \ settings/.shell:SETTINGS/.shell:$(PROGS)/system/shell/bin/eng/.shell \
settings/mykey.ini:SETTINGS/MYKEY.INI:$(PROGS)/system/MyKey/trunk/mykey_it.ini \ settings/mykey.ini:SETTINGS/MYKEY.INI:$(PROGS)/system/MyKey/trunk/mykey_it.ini \
# end of list # end of list

2
data/rus/Makefile
View File

@ -254,7 +254,7 @@ COPY_FILES:=\
fonts/litt.chr:FONTS/LITT.CHR:$(PROGS)/demos/bgitest/trunk/FONTS/LITT.CHR \ fonts/litt.chr:FONTS/LITT.CHR:$(PROGS)/demos/bgitest/trunk/FONTS/LITT.CHR \
games/snake.ini:GAMES/SNAKE.INI:$(PROGS)/games/snake/trunk/snake.ini \ games/snake.ini:GAMES/SNAKE.INI:$(PROGS)/games/snake/trunk/snake.ini \
media/kiv.ini:MEDIA/KIV.INI:$(PROGS)/media/kiv/trunk/kiv.ini \ media/kiv.ini:MEDIA/KIV.INI:$(PROGS)/media/kiv/trunk/kiv.ini \
.shell:.shell:$(PROGS)/system/shell/bin/rus/.shell \ settings/.shell:SETTINGS/.shell:$(PROGS)/system/shell/bin/rus/.shell \
settings/mykey.ini:SETTINGS/MYKEY.INI:$(PROGS)/system/MyKey/trunk/mykey.ini \ settings/mykey.ini:SETTINGS/MYKEY.INI:$(PROGS)/system/MyKey/trunk/mykey.ini \
example.asm:EXAMPLE.ASM:$(PROGS)/develop/examples/example/trunk/rus/example.asm \ example.asm:EXAMPLE.ASM:$(PROGS)/develop/examples/example/trunk/rus/example.asm \
# end of list # end of list

2
data/sp/Makefile
View File

@ -261,7 +261,7 @@ COPY_FILES:=\
games/soko-8.lev:GAMES/SOKO-8.LEV:$(PROGS)/games/soko/trunk/SOKO-8.LEV \ games/soko-8.lev:GAMES/SOKO-8.LEV:$(PROGS)/games/soko/trunk/SOKO-8.LEV \
games/soko-9.lev:GAMES/SOKO-9.LEV:$(PROGS)/games/soko/trunk/SOKO-9.LEV \ games/soko-9.lev:GAMES/SOKO-9.LEV:$(PROGS)/games/soko/trunk/SOKO-9.LEV \
media/kiv.ini:MEDIA/KIV.INI:$(PROGS)/media/kiv/trunk/kiv.ini \ media/kiv.ini:MEDIA/KIV.INI:$(PROGS)/media/kiv/trunk/kiv.ini \
.shell:.shell:$(PROGS)/system/shell/bin/eng/.shell \ settings/.shell:SETTINGS/.shell:$(PROGS)/system/shell/bin/eng/.shell \
settings/mykey.ini:SETTINGS/MYKEY.INI:$(PROGS)/system/MyKey/trunk/mykey.ini \ settings/mykey.ini:SETTINGS/MYKEY.INI:$(PROGS)/system/MyKey/trunk/mykey.ini \
# end of list # end of list

5
programs/system/shell/History.txt
View File

@ -1,3 +1,8 @@
Shell 0.7.2 // 26.10.2013 // Albom
* ” ©« .shell ¯¥à¥­¥á¥­ ¢ /sys/settings/
* ˆá¯à ¢«¥­  ª®¬ ­¤  "cd .."
Shell 0.7.1 // 19.10.2013 // Albom Shell 0.7.1 // 19.10.2013 // Albom
* ˆá¯à ¢«¥­  ®è¨¡ª , á¢ï§ ­­ ï á § ¢¨á ­¨¥¬ ¯à¨ ¯®¯ë⪥ ç⥭¨ï ¯ãá⮩ ¨áâ®à¨¨ ª®¬ ­¤ (¯® ª« ¢¨è ¬ Up ¨ Down) * ˆá¯à ¢«¥­  ®è¨¡ª , á¢ï§ ­­ ï á § ¢¨á ­¨¥¬ ¯à¨ ¯®¯ë⪥ ç⥭¨ï ¯ãá⮩ ¨áâ®à¨¨ ª®¬ ­¤ (¯® ª« ¢¨è ¬ Up ¨ Down)

2
programs/system/shell/cmd/cmd_cd.c
View File

@ -22,7 +22,7 @@ if ( ( 0 == strcmp(dir, "..") ) && ( 0 != strcmp(cur_dir, "/")) )
{ {
cur_dir[strlen(cur_dir)-1]='\0'; cur_dir[strlen(cur_dir)-1]='\0';
dir_truncate(cur_dir); dir_truncate(cur_dir);
return FALSE; return TRUE;
} }
if ( '/' == dir[0]) if ( '/' == dir[0])

2
programs/system/shell/globals.h
View File

@ -1,5 +1,5 @@
#define SHELL_VERSION "0.7.1" #define SHELL_VERSION "0.7.2"
extern char PATH[256]; extern char PATH[256];
extern char PARAM[256]; extern char PARAM[256];

8
programs/system/shell/shell.c
View File

@ -128,7 +128,13 @@ con_set_cursor_height(con_get_font_height()-1);
ALIASES = malloc(128*1024); ALIASES = malloc(128*1024);
if (PARAM[0] == 0) strcpy(CMD, ".shell"); if (PARAM[0] == 0)
{
strcpy(CMD, cur_dir);
strcat(CMD, ".shell");
if ( !file_check(CMD) )
strcpy(CMD, "/sys/settings/.shell");
}
else else
{ {
if (PARAM[0] == '/') if (PARAM[0] == '/')