Skip to content

Commit 7d07bc2

Browse files
committed
fix: erubis, 横書きの修正
この変更に伴いerubiを1.13.1から1.13に巻き戻し whiteleaf7/narou#440 whiteleaf7/narou#444
1 parent 624ce1f commit 7d07bc2

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

Dockerfile

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,18 @@ RUN git config --global user.email "you@example.com" && \
3737
git clone 'https://github.com/whiteleaf7/narou.git' /opt/narou && \
3838
cd /opt/narou && \
3939
git remote add etg-lt 'https://github.com/etg-lt/narou.git' && \
40+
git remote add rogenobl 'https://github.com/rogenobl/narou.git' && \
4041
git fetch origin && \
4142
git fetch etg-lt && \
43+
git fetch rogenobl && \
4244
git merge --no-ff etg-lt/patch-1 && \
4345
git merge --no-ff etg-lt/patch-2 && \
4446
git merge --no-ff etg-lt/patch-3 && \
47+
git merge --no-ff rogenobl/fix/replace_erubis && \
48+
git merge --no-ff rogenobl/fix/yokogaki_text_conv && \
4549
gem build narou.gemspec && \
4650
gem install ./narou-${NAROU_VERSION}.gem && \
47-
gem install erubi -v 1.13.1 --no-document && \
48-
sed -ie "s/tilt\/erubis/tilt\/erubi/g" /usr/local/bundle/gems/narou-${NAROU_VERSION}/lib/web/appserver.rb
51+
gem install erubi -v 1.13 --no-document
4952

5053
RUN (echo ; cat /usr/local/bundle/gems/narou-${NAROU_VERSION}/preset/custom_chuki_tag.txt) >> /opt/AozoraEpub3/chuki_tag.txt
5154

0 commit comments

Comments
 (0)