From ff6bfcd20bf17574b6959a56ecfd09fb999d690a Mon Sep 17 00:00:00 2001 From: Carlos Alexandro Becker Date: Wed, 24 May 2023 23:40:37 +0000 Subject: [PATCH] fix: unix2dos --- testscript/testdata/mirror.txtar | 7 ++++--- testscript/testdata/repo-create.txtar | 4 ++++ testscript/testdata/repo-import.txt | 4 ++++ testscript/testdata/set-username.txtar | 4 ++++ testscript/testdata/user_management.txtar | 4 ++++ 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/testscript/testdata/mirror.txtar b/testscript/testdata/mirror.txtar index bda7fe85f9d0cc24abc671e1c57541947b09e147..ea3dbc67db14fa4958bb30835725e269e1fa3df5 100644 --- a/testscript/testdata/mirror.txtar +++ b/testscript/testdata/mirror.txtar @@ -1,4 +1,8 @@ # vi: set ft=conf + +# convert crlf on windows +[windows] unix2dos info1.txt info2.txt tree.txt + # import a repo soft repo import --mirror charmbracelet/catwalk https://github.com/charmbracelet/catwalk.git @@ -64,9 +68,6 @@ cmp stdout info2.txt soft repo blob charmbracelet/test LICENSE stdout '.*Creative Commons.*' -[windows] unix2dos info1.txt -[windows] unix2dos info2.txt -[windows] unix2dos tree.txt -- info1.txt -- Project Name: diff --git a/testscript/testdata/repo-create.txtar b/testscript/testdata/repo-create.txtar index 7ba89aadb6753b18ee0fe3caef010c1fada7cfe8..d1d1b98613137496e3f98a3ecfb9ec9e30c8bb5f 100644 --- a/testscript/testdata/repo-create.txtar +++ b/testscript/testdata/repo-create.txtar @@ -1,4 +1,8 @@ # vi: set ft=conf + +# convert crlf on windows +[windows] unix2dos tree.txt readme.md branch_list.1.txt + # create a repo soft repo create repo1 -d 'description' -H -p -n 'repo11' soft repo hidden repo1 diff --git a/testscript/testdata/repo-import.txt b/testscript/testdata/repo-import.txt index eb558d76d5c5fcc81c59b3bed29020719363add3..df54b0024ad5c6644880ff318b0e1d63f4053f54 100644 --- a/testscript/testdata/repo-import.txt +++ b/testscript/testdata/repo-import.txt @@ -1,4 +1,8 @@ # vi: set ft=conf + +# convert crlf on windows +[windows] unix2dos repo3.txt + # import private soft repo import --private repo1 https://github.com/charmbracelet/catwalk.git soft repo private repo1 diff --git a/testscript/testdata/set-username.txtar b/testscript/testdata/set-username.txtar index 20fd1cb2efb919c3856a4761a5959c891a835be8..0331b228745d00027504b82b78ded160c0b58c6a 100644 --- a/testscript/testdata/set-username.txtar +++ b/testscript/testdata/set-username.txtar @@ -1,4 +1,8 @@ # vi: set ft=conf + +# convert crlf on windows +[windows] unix2dos info1.txt info2.txt + # get original username soft info cmpenv stdout info1.txt diff --git a/testscript/testdata/user_management.txtar b/testscript/testdata/user_management.txtar index 6a24e682fbfd28ac906a2af562018771e565073d..35d474b29886254071d28a51cefa20c085bdac1b 100644 --- a/testscript/testdata/user_management.txtar +++ b/testscript/testdata/user_management.txtar @@ -1,4 +1,8 @@ # vi: set ft=conf + +# convert crlf on windows +[windows] unix2dos info.txt admin_key_list1.txt admin_key_list2.txt list1.txt list2.txt foo_info1.txt foo_info2.txt foo_info3.txt foo_info4.txt foo_info5.txt + # add key to admin soft user add-pubkey admin "$ADMIN2_AUTHORIZED_KEY" soft user info admin