aboutsummaryrefslogtreecommitdiff
path: root/compiler
diff options
context:
space:
mode:
authorpacien2023-02-17 21:30:37 +0100
committerGitHub2023-02-17 21:30:37 +0100
commita4c0c516dd5b25b404a645f41e5a165e8547c2cb (patch)
tree62fdc955672f114f1cb240925e63d9d049a9e6fe /compiler
parent1215c5240786d3c64ef1dec5cf8e4b6ad2ec1b01 (diff)
parentd266ee66cf3e366fbeb6d92c03dedff3b7aa3f14 (diff)
downloadldgallery-a4c0c516dd5b25b404a645f41e5a165e8547c2cb.tar.gz
Merge pull request #354 from ldgallery/p_revert_utf8_term_fix
Revert "compiler: fix support for non-utf8 terminals"
Diffstat (limited to 'compiler')
-rw-r--r--compiler/app/Main.hs5
-rw-r--r--compiler/package.yaml3
2 files changed, 3 insertions, 5 deletions
diff --git a/compiler/app/Main.hs b/compiler/app/Main.hs
index a9630ce..3e6f254 100644
--- a/compiler/app/Main.hs
+++ b/compiler/app/Main.hs
@@ -1,7 +1,7 @@
1-- ldgallery - A static generator which turns a collection of tagged 1-- ldgallery - A static generator which turns a collection of tagged
2-- pictures into a searchable web gallery. 2-- pictures into a searchable web gallery.
3-- 3--
4-- Copyright (C) 2019-2022 Pacien TRAN-GIRARD 4-- Copyright (C) 2019-2021 Pacien TRAN-GIRARD
5-- 5--
6-- This program is free software: you can redistribute it and/or modify 6-- This program is free software: you can redistribute it and/or modify
7-- it under the terms of the GNU Affero General Public License as 7-- it under the terms of the GNU Affero General Public License as
@@ -28,7 +28,6 @@ import Data.Aeson (ToJSON)
28import System.FilePath ((</>)) 28import System.FilePath ((</>))
29import System.Directory (canonicalizePath, listDirectory) 29import System.Directory (canonicalizePath, listDirectory)
30import System.Console.CmdArgs 30import System.Console.CmdArgs
31import Main.Utf8 (withUtf8)
32 31
33import Compiler 32import Compiler
34import Files (readDirectory, copyTo, remove) 33import Files (readDirectory, copyTo, remove)
@@ -104,7 +103,7 @@ options = Options
104 103
105main :: IO () 104main :: IO ()
106main = 105main =
107 withUtf8 $ do 106 do
108 opts <- cmdArgs options 107 opts <- cmdArgs options
109 buildGallery opts 108 buildGallery opts
110 deployViewer opts 109 deployViewer opts
diff --git a/compiler/package.yaml b/compiler/package.yaml
index 539bf9d..4b749e1 100644
--- a/compiler/package.yaml
+++ b/compiler/package.yaml
@@ -4,7 +4,7 @@ homepage: https://ldgallery.pacien.org
4github: "pacien/ldgallery" 4github: "pacien/ldgallery"
5license: AGPL-3.0-only 5license: AGPL-3.0-only
6author: "Pacien TRAN-GIRARD, Guillaume FOUET" 6author: "Pacien TRAN-GIRARD, Guillaume FOUET"
7copyright: "2019-2022 Pacien TRAN-GIRARD, Guillaume FOUET" 7copyright: "2019-2021 Pacien TRAN-GIRARD, Guillaume FOUET"
8 8
9extra-source-files: 9extra-source-files:
10- readme.md 10- readme.md
@@ -29,7 +29,6 @@ dependencies:
29- safe 29- safe
30- time 30- time
31- process 31- process
32- with-utf8
33 32
34default-extensions: 33default-extensions:
35- DuplicateRecordFields 34- DuplicateRecordFields