quinn-os/quinn-os
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update copyright, add squirrel, update shell.

Browse Source
This commit is contained in:
Andrew Pamment 2023-05-15 11:36:37 +10:00
parent 15c51c6be3
commit 12805a750a
5 changed files with 89 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
misc/www/index.html
View File

@ -35,7 +35,7 @@
</div>
<div id="footer">
Quinn &copy; 2016-2022 Andrew Pamment
Quinn &copy; 2016-2023 Andrew Pamment
</div>
</div>
</body>

2
misc/www/taglines.rexx
View File

@ -39,7 +39,7 @@ say ' </div>'
say '</div>'
say '<div id="footer">'
say ' Quinn &copy; 2016-2022 Andrew Pamment'
say ' Quinn &copy; 2016-2023 Andrew Pamment'
say '</div>'
say '</div>'
say '</body>'

42
programs/external/squirrel/make.sh vendored Executable file
View File

@ -0,0 +1,42 @@
#!/bin/bash -e
if [ ! -e $HOME/Quinn/fsroot ]
then
echo "${HOME}/Quinn/fsroot doesn't exist! Please run make_userland.sh first!"
exit
fi
if [ ! -e squirrel_3_1_stable.tar.gz ]
then
wget https://downloads.sourceforge.net/project/squirrel/squirrel3/squirrel%203.1%20stable/squirrel_3_1_stable.tar.gz
fi
tar xf squirrel_3_1_stable.tar.gz
cd squirrel3
patch -p1 < ../squirrel_3_1.diff
cd squirrel
make sq32
cd ../sqstdlib
make sq32
cd ../sq
make sq32
cd ..
if [ ! -e $HOME/Quinn/fsroot/licenses ]
then
mkdir $HOME/Quinn/fsroot/licenses
fi
cp COPYRIGHT $HOME/Quinn/fsroot/licenses/squirrel.license
mv bin/sq sq.exe
i686-quinn-strip sq.exe
mv sq.exe $HOME/Quinn/fsroot/utilities/
cd ..
rm -rf squirrel3

36
programs/external/squirrel/squirrel_3_1.diff vendored Normal file
View File

@ -0,0 +1,36 @@
diff -Naur a/sq/Makefile b/sq/Makefile
--- a/sq/Makefile 2016-03-05 17:57:17.000000000 +1000
+++ b/sq/Makefile 2023-05-15 11:21:18.052402608 +1000
@@ -12,7 +12,7 @@
sq32:
- g++ -O2 -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
+ i686-quinn-g++ -O2 -fno-exceptions -fno-rtti -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
sqprof:
g++ -O2 -pg -fno-exceptions -fno-rtti -pie -gstabs -g3 -o $(OUT) $(SRCS) $(INCZ) $(LIBZ) $(LIB)
diff -Naur a/sqstdlib/Makefile b/sqstdlib/Makefile
--- a/sqstdlib/Makefile 2016-03-05 17:57:17.000000000 +1000
+++ b/sqstdlib/Makefile 2023-05-15 11:20:55.515199749 +1000
@@ -26,7 +26,7 @@
sq32:
- gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
+ i686-quinn-gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ)
ar rc $(OUT) *.o
rm *.o
diff -Naur a/squirrel/Makefile b/squirrel/Makefile
--- a/squirrel/Makefile 2016-03-05 17:57:17.000000000 +1000
+++ b/squirrel/Makefile 2023-05-15 11:20:11.033799367 +1000
@@ -37,7 +37,7 @@
sq32:
- gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
+ i686-quinn-gcc -O2 -fno-exceptions -fno-rtti -Wall -fno-strict-aliasing -c $(SRCS) $(INCZ) $(DEFS)
ar rc $(OUT) *.o
rm *.o

8
programs/shell/shell.c
View File

@ -339,9 +339,17 @@ int main(int argc, char **argv) {
if (!stat(buffer2, &s)) {
if (S_ISDIR(s.st_mode)) {
printf("\e[1;34m%-20s\e[0m (Directory)\n", dent->name);
} else {
if (strlen(dent->name) > 4) {
if (strcasecmp(&dent->name[strlen(dent->name) - 4], ".exe") == 0) {
printf("\e[1;32m%-20s\e[0m %d\n", dent->name, s.st_size);
} else {
printf("%-20s %d\n", dent->name, s.st_size);
}
} else {
printf("%-20s %d\n", dent->name, s.st_size);
}
}
lines++;
if (lines == 24 && pause) {
lines = 0;