From patchwork Sat Feb 20 23:58:27 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Prikler X-Patchwork-Id: 27170 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2157627BC49; Sun, 21 Feb 2021 00:24:11 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS, T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 55A1527BC48 for ; Sun, 21 Feb 2021 00:24:10 +0000 (GMT) Received: from localhost ([::1]:47432 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lDcXh-0004yt-G0 for patchwork@mira.cbaines.net; Sat, 20 Feb 2021 19:24:09 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32990) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lDcXa-0004xi-8X for guix-patches@gnu.org; Sat, 20 Feb 2021 19:24:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:41615) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lDcXa-000702-1h for guix-patches@gnu.org; Sat, 20 Feb 2021 19:24:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lDcXZ-0002Vs-UY for guix-patches@gnu.org; Sat, 20 Feb 2021 19:24:01 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#46671] [PATCH] gnu: renpy-build-system: Quote data directory. Resent-From: Leo Prikler Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 21 Feb 2021 00:24:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 46671 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 46671@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.16138670379647 (code B ref -1); Sun, 21 Feb 2021 00:24:01 +0000 Received: (at submit) by debbugs.gnu.org; 21 Feb 2021 00:23:57 +0000 Received: from localhost ([127.0.0.1]:53161 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDcXU-0002VX-Uh for submit@debbugs.gnu.org; Sat, 20 Feb 2021 19:23:57 -0500 Received: from lists.gnu.org ([209.51.188.17]:48726) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lDcXS-0002VP-95 for submit@debbugs.gnu.org; Sat, 20 Feb 2021 19:23:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:32986) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lDcXR-0004pl-Pp for guix-patches@gnu.org; Sat, 20 Feb 2021 19:23:54 -0500 Received: from mailrelay.tugraz.at ([129.27.2.202]:24321) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lDcXO-0006sC-Bg for guix-patches@gnu.org; Sat, 20 Feb 2021 19:23:53 -0500 Received: from localhost.localdomain (217-149-164-20.nat.highway.telekom.at [217.149.164.20]) by mailrelay.tugraz.at (Postfix) with ESMTPSA id 4DjmJH1pbRz1LBSW for ; Sun, 21 Feb 2021 01:23:42 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 mailrelay.tugraz.at 4DjmJH1pbRz1LBSW DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=tugraz.at; s=mailrelay; t=1613867023; bh=EKuy/RG4IYRGlOaqPDUfE9VIS6OYJYkI5HtUZaSdPZg=; h=From:To:Subject:Date:From; b=PgJYy0Tp4WjwObkf1iCHH+KDaSnuB/On1zAgp1zt02qBYsghgbcFnhWOnGlmFsA0f Yfd5kIejcOHwe5aY/hQieqFs1NQPUD5DhX4gfWP+Bln1e0TMu+N1dm69jWrtkYemar hPTIB6hMWXZsATD8DxQPBjdE3BFTSZobpx+x3rms= From: Leo Prikler Date: Sun, 21 Feb 2021 00:58:27 +0100 Message-Id: <20210220235826.24017-1-leo.prikler@student.tugraz.at> X-Mailer: git-send-email 2.30.1 MIME-Version: 1.0 X-TUG-Backscatter-control: bt4lQm5Tva3SBgCuw0EnZw X-Scanned-By: MIMEDefang 2.74 on 129.27.10.116 Received-SPF: pass client-ip=129.27.2.202; envelope-from=leo.prikler@student.tugraz.at; helo=mailrelay.tugraz.at X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches This prevents generated launchers and desktop files from inadvertently crashing if the directory name contains a space. * gnu/build/renpy-build-system.scm (install, install-desktop-file): Use ~s to format data directory. --- guix/build/renpy-build-system.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/guix/build/renpy-build-system.scm b/guix/build/renpy-build-system.scm index 464fc97b13..66683971c5 100644 --- a/guix/build/renpy-build-system.scm +++ b/guix/build/renpy-build-system.scm @@ -57,7 +57,7 @@ (delete-file (string-append data "/renpy-build.json")) (call-with-output-file launcher (lambda (port) - (format port "#!~a~%~a ~a \"$@\"" + (format port "#!~a~%~a ~s \"$@\"" (which "bash") (which "renpy") data))) @@ -77,8 +77,9 @@ (string-append out "/share/applications/" executable-name ".desktop") #:name (assoc-ref json-dump "name") #:generic-name (assoc-ref build "display_name") - #:exec (string-append (which "renpy") " " - out "/share/renpy/" directory-name) + #:exec (format #f "~a ~s" + (which "renpy") + (string-append out "/share/renpy/" directory-name)) #:categories '("Game" "Visual Novel"))) #t)