haskal
/
crossfire
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix packaging issues

This commit is contained in:
xenia 2021-01-10 05:26:41 -05:00
parent 333eddc88b
commit a60f83cd16
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
crossfire/server.rkt
View File

@ -291,11 +291,13 @@
(-> file-transfer? integer?) (-> file-transfer? integer?)
(enforce-subject 'client) (enforce-subject 'client)
(log-server-info "new project upload") (log-server-info "new project upload")
(define out-file (make-temporary-file)) (define out-file (make-temporary-file "cfupload~a"))
(define extract-dir (make-temporary-file "rkttmp~a" 'directory)) (define extract-dir (make-temporary-file "cfupload~a" 'directory))
(with-handlers ([exn? (lambda (ex) (with-handlers ([exn? (lambda (ex)
(delete-directory/files out-file) (with-handlers ([exn:fail? void])
(delete-directory/files extract-dir) (delete-directory/files out-file))
(with-handlers ([exn:fail? void])
(delete-directory/files extract-dir))
(raise ex))]) (raise ex))])
(define out-port (open-output-file out-file #:exists 'truncate)) (define out-port (open-output-file out-file #:exists 'truncate))
(file-transfer-connect upload-ft out-port) (file-transfer-connect upload-ft out-port)

2
dist/PKGBUILD vendored
View File

@ -44,7 +44,7 @@ build() {
_arch="$(gcc -dumpmachine)" _arch="$(gcc -dumpmachine)"
_raco="$srcdir/crossfire/agent-deployment/arch_$_arch/vendor/racket-$_pkgver_emb_racket/bin/raco" _raco="$srcdir/crossfire/agent-deployment/arch_$_arch/vendor/racket-$_pkgver_emb_racket/bin/raco"
"$_raco" pkg install --skip-installed --auto "$srcdir/crossfire/crossfire" "$_raco" pkg install --skip-installed --auto "$srcdir/crossfire/crossfire"
"$_raco" exe -o "$srcdir/crossfire/crossfire-server" "$srcdir/crossfire/crossfire/server.rkt" "$_raco" exe ++lang north -o "$srcdir/crossfire/crossfire-server" "$srcdir/crossfire/crossfire/server.rkt"
"$_raco" exe -o "$srcdir/crossfire/crossfire-client" "$srcdir/crossfire/crossfire/client.rkt" "$_raco" exe -o "$srcdir/crossfire/crossfire-client" "$srcdir/crossfire/crossfire/client.rkt"
} }