Skip to content
This repository was archived by the owner on Jun 9, 2023. It is now read-only.

Commit 05c36db

Browse files
committed
Moar changes
1 parent 95f168e commit 05c36db

File tree

4 files changed

+14
-3
lines changed

4 files changed

+14
-3
lines changed

install.py

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -449,9 +449,18 @@ def register_file(system):
449449
# as cp037 (IBM-037)
450450
if is_rw_with_EBCDIC(file):
451451
encoding = "cp1047"
452-
newline = "\x85"
453452
left_bracket = "\xDD"
454453
right_bracket = "\xA8"
454+
455+
# newline must be '\x85' when using IzODA and Rocket Pythons, but
456+
# '\n' when using IBM Python. Since we can only easily support one
457+
# path at the moment, we're going to support IBM Python since it
458+
# works better. This code is only needed to run when .bashrc and/or
459+
# .bash_profile is untagged; if the files are already tagged ASCII
460+
# or EBCDIC, then everything works fine on both IzODA/Rocket IBM
461+
# Pythons. We will document this in known-issues.md and call it
462+
# a day.
463+
#newline = "\x85"
455464

456465
print(f"registering {file}")
457466
append_to_file(file, "# CLAI setup"+newline, encoding)

known-issues.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,6 @@ instructions in [README.md](README.md), or you can run:
5757

5858
#### IzODA Python 3.6
5959

60+
+ In order for install/uninstall to work properly your `.bashrc` and
61+
`.bash_profile` files must be tagged either ISO8859-1 or IBM-1047 beforehand
6062
+ The `zmsgcode` plugin fails to work due to an SSL validation failure

test_integration/test_install.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
)
2424

2525
INSTALL_CORRECTLY_MESSAGE = "CLAI has been installed correctly, you will need to restart your shell."
26-
UNINSTALL_CORRECTLY_MESSAGE = "CLAI has been uninstalled correctly, you need restart your shell."
26+
UNINSTALL_CORRECTLY_MESSAGE = "CLAI has been uninstalled correctly, you will need to restart your shell."
2727

2828

2929
def test_install_should_finish_correctly(my_clai):

uninstall.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ def execute(args):
186186
remove_setup_file(get_setup_file())
187187
remove_setup_register()
188188

189-
print_complete("CLAI has been uninstalled correctly, you need restart your shell.")
189+
print_complete("CLAI has been uninstalled correctly, you will need to restart your shell.")
190190

191191
return 0
192192

0 commit comments

Comments
 (0)