Skip to content

Commit

Permalink
Xbps package multiplatform creation prepared
Browse files Browse the repository at this point in the history
  • Loading branch information
slamko committed Jul 11, 2022
1 parent 1ccfe79 commit 5aa4500
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 8 deletions.
4 changes: 0 additions & 4 deletions packaging/xbps/Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
build-xbps: installdirs
./packaging/xbps/xbps-create.sh $(PKG_NAME) "x86_64"
./packaging/xbps/xbps-create.sh $(PKG_NAME) "amd64"

clean-xbps:
$(RM) *.xbps
$(RM) *repodata
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#!/bin/sh

# arg $1 - target directory
# arg $2 - architecture

xbps-create --architecture "$2" \
xbps-create --architecture amd64 \
--pkgver "$1" \
--dependencies "git>=2.9.5 xdg-utils>=1.0.0 libbsd>=0.2.1" \
--homepage "https://github.com/slamko/spmn" \
Expand Down
16 changes: 16 additions & 0 deletions packaging/xbps/xbps-create-x86_64.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#!/bin/sh

# arg $1 - target directory

xbps-create --architecture x86_64 \
--pkgver "$1" \
--dependencies "git>=2.9.5 xdg-utils>=1.0.0 libbsd>=0.2.1" \
--homepage "https://github.com/slamko/spmn" \
--desc "Suckless Patch Manager" \
--compression=xz \
--license GPLv3 \
--maintainer "Viacheslav <https://github.com/slamko>" \
--long-desc "Command line tool for easy patch managing for suckless software." \
"$1"


5 changes: 3 additions & 2 deletions src/commands/runsearch.c
Original file line number Diff line number Diff line change
Expand Up @@ -98,9 +98,10 @@ static int parse_search_symbols(searchsyms *sargs, char **sstrings,
words = wrealloc;
}

if (!words)
if (!words) {
DO_CLEAN_ALL();

}

for (token = strtok_r(parsedsstr, delim, &context);
token && wid < tstrcnt; token = strtok_r(NULL, delim, &context)) {
if (*token != '-') {
Expand Down

0 comments on commit 5aa4500

Please sign in to comment.