From 500bbb02ead6038b145ed4fc8d82d86aad93e920 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 13 Jul 2024 14:43:49 +0300 Subject: [PATCH] fixed build.sh --- TODO | 1 - build.sh | 24 ++++++++++++++++++------ build-box.sh => scripts/build-box.sh | 22 ++++++++-------------- src/grep.c | 1 - 4 files changed, 26 insertions(+), 22 deletions(-) rename build-box.sh => scripts/build-box.sh (63%) diff --git a/TODO b/TODO index 7c5f761..e7dc62c 100644 --- a/TODO +++ b/TODO @@ -49,6 +49,5 @@ BUGS: xargs (getopt with glibc) FIX: - ps (proc_parser.h) echo (escape) que (unicode) diff --git a/build.sh b/build.sh index 72ff08b..11b029c 100755 --- a/build.sh +++ b/build.sh @@ -1,11 +1,23 @@ #!/bin/sh -CFLAGS="-s -Os -Wextra -Wall -pedantic" -CC="cc" +./clean.sh + +if [ -z $CC ]; then + CC="cc" +fi + +if [ -z $CFLAGS ]; then + CFLAGS="-s -Os -Wextra -Wall -pedantic" +fi chmod +x ./libmu/build-libmu.sh ./libmu/build-libmu.sh -for i in $(ls src); do - echo "CC $i" - echo $CFLAGS | xargs $CC -Iconfigs -Ilibmu src/$i -o bin/$(basename $i .c) obj/*.o -done +if [[ $1 == "box" ]]; then + env CC="$CC" CFLAGS="$CFLAGS" ./scripts/build-box.sh + +else + for i in $(ls src); do + echo "CC $i" + echo $CFLAGS | xargs $CC -Iconfigs -Ilibmu src/$i -o bin/$(basename $i .c) obj/*.o + done +fi diff --git a/build-box.sh b/scripts/build-box.sh similarity index 63% rename from build-box.sh rename to scripts/build-box.sh index 8e58f20..0941afc 100755 --- a/build-box.sh +++ b/scripts/build-box.sh @@ -1,10 +1,4 @@ #!/bin/sh -CFLAGS="-s -Os -Wextra -Wall -pedantic" -CC="cc" - -chmod +x ./libmu/build-libmu.sh -./libmu/build-libmu.sh - cat > mutils.c << EOF #include #include @@ -18,15 +12,15 @@ struct cmd { int (*func)(int argc, char **argv); const char *str; } cmds[] = { -$(for i in $(ls src); do - f=$(basename $i .c) + $(for i in $(ls src); do + f=$(basename $i .c) - #EDIT SOURCES - cat src/$i | sed "s/main(/"$f"_main(/g" > bin/$i + #EDIT SOURCES + cat src/$i | sed "s/main(/"$f"_main(/g" > bin/$i - #MAKE STRUCTURE - echo -e "\t{"$f"_main, \"$f\"}," -done) + #FILL STRUCTURE + echo -e "\t{"$f"_main, \"$f\"}," + done) }; int main(int argc, char **argv) { @@ -47,4 +41,4 @@ int main(int argc, char **argv) { } EOF -echo $CFLAGS | xargs $CC -Iconfigs -Ilibmu bin/*.c obj/*.o mutils.c -omutils +echo $CFLAGS | xargs $CC -Iconfigs -Ilibmu mutils.c obj/*.o bin/*.c -o mutils diff --git a/src/grep.c b/src/grep.c index 4fbfa0b..c9590a2 100644 --- a/src/grep.c +++ b/src/grep.c @@ -13,7 +13,6 @@ static size_t r_size; static char i_flag; static char F_flag; -static char E_flag; static char H_flag; static int addpattern(char *str) {