summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRoman Smrž <roman.smrz@seznam.cz>2026-09-05 10:18:57 +0200
committerRoman Smrž <roman.smrz@seznam.cz>2026-09-07 21:05:04 +0200
commitb1acf22f3deaa7ef233ec5e3e7ea12aa5c02929e (patch)
treed2cb2db277e658353111204fdc2719f7b592bf29 /src
parent28f8970012faaae85cf730e879cfb6bdcefa9bb7 (diff)
Accept asset path for variable expansion in shell argumentsHEADmaster
Diffstat (limited to 'src')
-rw-r--r--src/Asset.hs4
-rw-r--r--src/Script/Shell.hs2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Asset.hs b/src/Asset.hs
index 37e332b..2b14dcf 100644
--- a/src/Asset.hs
+++ b/src/Asset.hs
@@ -1,6 +1,6 @@
module Asset (
Asset(..),
- AssetPath(..),
+ AssetPath(..), textAssetPath,
) where
import Data.Text (Text)
@@ -27,7 +27,7 @@ instance ExprType Asset where
]
instance ExprType AssetPath where
- textExprType _ = "filepath"
+ textExprType _ = "Filepath"
textExprValue = ("filepath:" <>) . textAssetPath
exprExpansionConvTo = cast textAssetPath
diff --git a/src/Script/Shell.hs b/src/Script/Shell.hs
index c89e5af..6f6eb64 100644
--- a/src/Script/Shell.hs
+++ b/src/Script/Shell.hs
@@ -34,6 +34,7 @@ import System.Posix.Process
import System.Posix.Types
import System.Process hiding (ShellCommand)
+import Asset
import Network
import Network.Ip
import Output
@@ -114,6 +115,7 @@ shellExpansionTemplate fromSingle fromList = listToMaybe $ catMaybes
[ single id
, single (T.pack . show @Integer)
, single (T.pack . show @Scientific)
+ , single textAssetPath
]
where
single :: forall c. (ExprType c) => (c -> Text) -> Maybe (b -> a)