diff --git a/fish/PKGBUILD b/fish/PKGBUILD
index cd66305bb4b..bd830fc1a85 100644
--- a/fish/PKGBUILD
+++ b/fish/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=fish
 pkgver=4.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Smart and user friendly shell intended mostly for interactive use'
 arch=('x86_64')
 url="https://fishshell.com/"
@@ -26,10 +26,10 @@ source=("https://github.com/fish-shell/fish-shell/releases/download/${pkgver}/${
         msystem.fish
         perlbin.fish)
 sha256sums=('fc9165f733a0e28a3dba11c9b1a286bc88a853f152a6694cd993512a2f1761aa'
-            '983c3273e0249957ed6c40785e005739da30f31d4f029383f257f9990d38811a'
-            '8bb0d28df47b66e6785f7db00a2c4316bc15960e67bdec0daca7f811f5bf3895'
-            '71c6990b39caf5d50c10f10074283adfc6a36aafff30fd54f7eb451d4e007496'
-            'b136a9fa94abf53e302f7a1cc28def03b58dd2326990c5f02ceb4988341a5ac6')
+            '1cd3d051b679e8cd10eae2bc6ff7f9c7fff43150b640eef3885fb19d26f98c38'
+            'cafb7cd33e86357ccf1e2264019b0906c1a7007778e070875713321dd7f36862'
+            '284dbc3c996dd035da692297f9aa269f0748719177604d1930c332c69948bce7'
+            '90fe7e709aad25661829a997035ec15ba2b10e4982960dad888197f77c73c0ce')
 
 prepare() {
   cd "${pkgname}-${pkgver}"
diff --git a/fish/config.fish b/fish/config.fish
index b7930e3e6b2..3bd6edfd67f 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -15,4 +15,4 @@
 
 if status --is-login
 	source /etc/fish/msys2.fish
-end
\ No newline at end of file
+end
diff --git a/fish/msys2.fish b/fish/msys2.fish
index 3f4ad64a473..1bcbd5414a2 100644
--- a/fish/msys2.fish
+++ b/fish/msys2.fish
@@ -1,9 +1,9 @@
-# To the extent possible under law, the author(s) have dedicated all 
-# copyright and related and neighboring rights to this software to the 
-# public domain worldwide. This software is distributed without any warranty. 
-# You should have received a copy of the CC0 Public Domain Dedication along 
-# with this software. 
-# If not, see <https://creativecommons.org/publicdomain/zero/1.0/>. 
+# To the extent possible under law, the author(s) have dedicated all
+# copyright and related and neighboring rights to this software to the
+# public domain worldwide. This software is distributed without any warranty.
+# You should have received a copy of the CC0 Public Domain Dedication along
+# with this software.
+# If not, see <https://creativecommons.org/publicdomain/zero/1.0/>.
 
 
 # System-wide profile file
@@ -14,7 +14,7 @@
 # To learn more about startup files, refer to your shell's man page.
 
 set MSYS2_PATH /usr/local/bin /usr/bin /bin
-set -x MANPATH /usr/local/man /usr/share/man /usr/man /share/man 
+set -x MANPATH /usr/local/man /usr/share/man /usr/man /share/man
 set -x INFOPATH /usr/local/info /usr/share/info /usr/info /share/info
 
 if not set -q MSYS2_PATH_TYPE
@@ -26,7 +26,7 @@ case strict
     # Do not inherit any path configuration, and allow for full customization
     # of external path. This is supposed to be used in special cases such as
     # debugging without need to change this file, but not daily usage.
-    set -ex ORIGINAL_PATH
+    set -x ORIGINAL_PATH
 case inherit
     # Inherit previous path. Note that this will make all of the Windows path
     # available in current shell, with possible interference in project builds.
@@ -37,7 +37,7 @@ case '*'
     # Do not inherit any path configuration but configure a default Windows path
     # suitable for normal usage with minimal external interference.
     set -l PATH $MSYS2_PATH 2>/dev/null
-	set WIN_ROOT (cygpath -Wu)	
+	set WIN_ROOT (cygpath -Wu)
     set -x ORIGINAL_PATH $WIN_ROOT/System32 $WIN_ROOT $WIN_ROOT/System32/Wbem $WIN_ROOT/System32/WindowsPowerShell/v1.0/
 end
 
@@ -82,7 +82,7 @@ end
 # TMP and TEMP as defined in the Windows environment must be kept
 # for windows apps, even if started from msys2. However, leaving
 # them set to the default Windows temporary directory or unset
-# can have unexpected consequences for msys2 apps, so we define 
+# can have unexpected consequences for msys2 apps, so we define
 # our own to match GNU/Linux behaviour.
 #
 # Note: this uppercase/lowercase workaround does not seem to work.
diff --git a/fish/msystem.fish b/fish/msystem.fish
index 9d5046c5db1..63c7b68c59f 100644
--- a/fish/msystem.fish
+++ b/fish/msystem.fish
@@ -52,4 +52,4 @@ switch $MSYSTEM
     set -x MSYSTEM_PREFIX '/usr'
     set -x MSYSTEM_CARCH (/usr/bin/uname -m)
     set -x MSYSTEM_CHOST (/usr/bin/uname -m)"-pc-cygwin"
-end
\ No newline at end of file
+end
diff --git a/fish/perlbin.fish b/fish/perlbin.fish
index 6dd8a50e0cb..769f86356ad 100644
--- a/fish/perlbin.fish
+++ b/fish/perlbin.fish
@@ -16,4 +16,4 @@ __addpath /usr/bin/vendor_perl
 __addpath /usr/lib/perl5/vendor_perl/bin
 __addpath /usr/bin/core_perl
 
-functions -e __addpath
\ No newline at end of file
+functions -e __addpath