Sinipelto
/
banan-os
forked from Bananymous/banan-os
1
0
Fork 0
Code Pull Requests Activity

update main #1

Merged
Sinipelto merged 240 commits from Bananymous/banan-os:main into main 2023-11-20 13:20:51 +02:00
Conversation 0 Commits 240 Files Changed 263 +21 -2
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 44cb0af64f - Show all commits

BIN
base-sysroot.tar.gz
View File

Binary file not shown.

23
userspace/Shell/main.cpp
View File

@ -691,6 +691,24 @@ int source_script(const BAN::String& path)
return ret;
}
bool exists(const BAN::String& path)
{
struct stat st;
return stat(path.data(), &st) == 0;
}
int source_shellrc()
{
if (char* home = getenv("HOME"))
{
BAN::String path(home);
MUST(path.append("/.shellrc"sv));
if (exists(path))
return source_script(path);
}
return 0;
}
int character_length(BAN::StringView prompt)
{
int length { 0 };
@ -717,7 +735,7 @@ BAN::String get_prompt()
{
const char* raw_prompt = getenv("PS1");
if (raw_prompt == nullptr)
return ""sv;
return "$ "sv;
BAN::String prompt;
for (int i = 0; raw_prompt[i]; i++)
@ -853,7 +871,8 @@ int main(int argc, char** argv)
if (argc >= 1)
setenv("SHELL", argv[0], true);
setenv("PS1", "\e[32m\\u@\\h\e[m:\e[34m\\~\e[m$ ", false);
source_shellrc();
tcgetattr(0, &old_termios);