Remove bash-only features for sh scripts
Fix order of CC arguments to aid in linking on newer versions
This commit is contained in:
parent
4e0b961fcb
commit
122437115d
10
build.sh
10
build.sh
|
@ -1,15 +1,15 @@
|
|||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
CC=clang
|
||||
SRC=rose.c
|
||||
REQS= #./plugins/*/*.c
|
||||
DEPS=('webkit2gtk-4.0')
|
||||
DEPS='webkit2gtk-4.0'
|
||||
|
||||
INCS=`pkg-config --cflags ${DEPS[@]}`
|
||||
LIBS=`pkg-config --libs ${DEPS[@]}`
|
||||
INCS=`pkg-config --cflags ${DEPS}`
|
||||
LIBS=`pkg-config --libs ${DEPS}`
|
||||
|
||||
# Optional adblocking depends on https://github.com/jun7/wyebadblock
|
||||
WYEBAB='-L/usr/lib/wyebrowser/adblock.so'
|
||||
|
||||
cp -f config.def.h config.h
|
||||
$CC $INCS $LIBS $REQS $SRC $WYEBAB -o rose
|
||||
$CC $INCS $REQS $SRC -o rose $LIBS $WYEBAB
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#!/bin/bash
|
||||
#!/bin/sh
|
||||
|
||||
test "$1" = "--help" || test -z "$1" && {
|
||||
echo -e "usage: rose-mklink <alias> <url>\n"
|
||||
echo "Create a /usr/bin link to a website."
|
||||
printf "%s\n" "usage: rose-mklink <alias> <url>" \
|
||||
"Create a /usr/bin link to a website."
|
||||
exit
|
||||
}
|
||||
|
||||
|
@ -12,6 +12,6 @@ test -z "$2" || {
|
|||
exit 1
|
||||
}
|
||||
|
||||
echo -e "#!/bin/sh\n\nrose $2" > /usr/bin/$1
|
||||
printf "#!/bin/sh\n\nrose %s" "$2" > /usr/bin/$1
|
||||
chmod +x /usr/bin/$1
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user