Revert "Add native support to fish shell (ros#1168)"

This reverts commit be490b2.
locusrobotics · Sep 18, 2023 · 0f8d949 · 0f8d949
1 parent 3d39ea7
commit 0f8d949
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 152 deletions.
diff --git a/cmake/catkin_generate_environment.cmake b/cmake/catkin_generate_environment.cmake
@@ -48,7 +48,7 @@ function(catkin_generate_environment)
       ${CATKIN_DEVEL_PREFIX}/env.sh
       @ONLY)
     # generate setup for various shells
-    foreach(shell bash sh zsh fish)
+    foreach(shell bash sh zsh)
       atomic_configure_file(${catkin_EXTRAS_DIR}/templates/setup.${shell}.in
         ${CATKIN_DEVEL_PREFIX}/setup.${shell}
         @ONLY)
@@ -101,7 +101,7 @@ function(catkin_generate_environment)
 
   # initialize shell support per platform.
   set(CATKIN_ENV_SHELL sh)
-  set(CATKIN_SETUP_SHELL bash sh zsh fish)
+  set(CATKIN_SETUP_SHELL bash sh zsh)
   if(WIN32)
     set(CATKIN_ENV_SHELL bat)
     set(CATKIN_SETUP_SHELL bat)

diff --git a/cmake/templates/local_setup.fish.in b/cmake/templates/local_setup.fish.in
diff --git a/cmake/templates/setup.fish.in b/cmake/templates/setup.fish.in
diff --git a/cmake/templates/setup.sh.in b/cmake/templates/setup.sh.in
@@ -62,7 +62,7 @@ CATKIN_SHELL=$CATKIN_SHELL "$_SETUP_UTIL" $@ ${CATKIN_SETUP_UTIL_ARGS:-} >> "$_S
 _RC=$?
 if [ $_RC -ne 0 ]; then
   if [ $_RC -eq 2 ]; then
-    echo "Could not write the output of '$_SETUP_UTIL' to temporary file '$_SETUP_TMP': maybe the disk is full?"
+    echo "Could not write the output of '$_SETUP_UTIL' to temporary file '$_SETUP_TMP': may be the disk if full?"
   else
     echo "Failed to run '\"$_SETUP_UTIL\" $@': return code $_RC"
   fi

diff --git a/test/local_tests/test_with_mock_workspace.py b/test/local_tests/test_with_mock_workspace.py
@@ -31,8 +31,7 @@ def test_catkin_only(self):
         assert_exists(self.installdir,
                       'env.sh',
                       'setup.sh',
-                      'setup.zsh',
-                      'setup.fish')
+                      'setup.zsh')
 
     def test_linker_options_propagation(self):
         dstdir = os.path.join(self.workspacedir, 'linker_options')
@@ -44,8 +43,7 @@ def test_linker_options_propagation(self):
         assert_exists(self.installdir,
                       'env.sh',
                       'setup.sh',
-                      'setup.zsh',
-                      'setup.fish')
+                      'setup.zsh')
 
     def test_nolang(self):
         dstdir = os.path.join(self.workspacedir, 'nolangs')

diff --git a/test/utils.py b/test/utils.py
@@ -95,7 +95,7 @@ def succeed(cmd, **kwargs):
     """
     print(">>>", cmd, kwargs)
     (r, out, err) = run(cmd, **kwargs)
-    print("<<<", out.decode("utf-8"))
+    print("<<<", out)
     assert r == 0, "cmd failed with result %s:\n %s " % (r, str(cmd))
     return out
 
@@ -106,7 +106,7 @@ def fail(cmd, **kwargs):
     """
     print(">>>", cmd, kwargs)
     (r, out, err) = run(cmd, withexitstatus=True, **kwargs)
-    print("<<<", out.decode("utf-8"))
+    print("<<<", out)
     assert 0 != r, """cmd succeeded, though should fail: %s
   result=%u\n  output=\n%s""" % (cmd, r, out)
     return out