Changeset 646

Timestamp:

08/03/12 10:51:23 (10 months ago)

Author:

jeremyhu@…

Message:

Set XAuthLocation in /etc/ssh_config and /etc/sshd_config

File:

• trunk/pkg/scripts/postinst_sl.sh (modified) (1 diff)

trunk/pkg/scripts/postinst_sl.sh

@@ -1 +1 @@
 #!/bin/sh
 
-[[ -f /etc/paths.d/XQuartz ]] && rm /etc/paths.d/XQuartz 
-[[ -f /etc/manpaths.d/XQuartz ]] && rm /etc/manpaths.d/XQuartz 
+if ! cat /etc/sshd_config | grep -v '^#' | grep -q XAuthLocation ; then
+    {
+        echo ""
+        echo "# XAuthLocation added by XQuartz (http://xquartz.macosforge.org)"
+        echo "XAuthLocation /opt/X11/bin/xauth"
+    } >> /etc/sshd_config
+fi
+
+if ! cat /etc/ssh_config | grep -v '^#' | grep -q XAuthLocation ; then
+    {
+        echo ""
+        echo "# XAuthLocation added by XQuartz (http://xquartz.macosforge.org)"
+        echo "Host *"
+        echo "    XAuthLocation /opt/X11/bin/xauth"
+    } >> /etc/ssh_config
+fi
+
+[[ -f /etc/paths.d/XQuartz ]] && rm /etc/paths.d/XQuartz
+[[ -f /etc/manpaths.d/XQuartz ]] && rm /etc/manpaths.d/XQuartz
 
 [[ -d /opt/X11/include/libpng12 ]] && rm -rf /opt/X11/include/libpng12