From 83f625445b87b8c5cb53c1a152f03402c0606dee Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Fri, 11 Jan 2013 12:24:44 -0500
Subject: [PATCH] MAINT-1481: Remove xmenity script and viewer_manifest.py
references.
---
indra/newview/viewer_manifest.py | 5 +-
.../updater/scripts/linux/xmenity | 55 -------------------
2 files changed, 2 insertions(+), 58 deletions(-)
delete mode 100755 indra/viewer_components/updater/scripts/linux/xmenity
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index bc623aee007..e7108141ee8 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -970,7 +970,6 @@ def construct(self):
self.path("../linux_crash_logger/linux-crash-logger","linux-crash-logger.bin")
self.path2basename("../llplugin/slplugin", "SLPlugin")
self.path2basename("../viewer_components/updater/scripts/linux", "update_install")
- self.path2basename("../viewer_components/updater/scripts/linux", "xmenity")
self.end_prefix("bin")
if self.prefix("res-sdl"):
@@ -1001,7 +1000,7 @@ def construct(self):
def copy_finish(self):
# Force executable permissions to be set for scripts
# see CHOP-223 and http://mercurial.selenic.com/bts/issue1802
- for script in 'secondlife', 'bin/update_install', 'bin/xmenity':
+ for script in 'secondlife', 'bin/update_install':
self.run_command("chmod +x %r" % os.path.join(self.get_dst_prefix(), script))
def package_finish(self):
@@ -1055,7 +1054,7 @@ def package_finish(self):
def strip_binaries(self):
if self.args['buildtype'].lower() == 'release' and self.is_packaging_viewer():
print "* Going strip-crazy on the packaged binaries, since this is a RELEASE build"
- self.run_command(r"find %(d)r/bin %(d)r/lib -type f \! \( -name update_install -o -name xmenity \) | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} ) # makes some small assumptions about our packaged dir structure
+ self.run_command(r"find %(d)r/bin %(d)r/lib -type f \! -name update_install | xargs --no-run-if-empty strip -S" % {'d': self.get_dst_prefix()} ) # makes some small assumptions about our packaged dir structure
class Linux_i686Manifest(LinuxManifest):
def construct(self):
diff --git a/indra/viewer_components/updater/scripts/linux/xmenity b/indra/viewer_components/updater/scripts/linux/xmenity
deleted file mode 100755
index c0c033904c1..00000000000
--- a/indra/viewer_components/updater/scripts/linux/xmenity
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-# @file xmenity
-# @author Nat Goodspeed
-# @date 2013-01-09
-# @brief Provide progress UI for bash scripts (e.g. update_install) using
-# zenity if available, xmessage if not.
-#
-# $LicenseInfo:firstyear=2013&license=viewerlgpl$
-# Copyright (c) 2013, Linden Research, Inc.
-# $/LicenseInfo$
-
-# This script invokes either zenity --progress or, if zenity is unavailable,
-# wraps xmessage in a zenity-like interface. That is its mutant power.
-# Pass $1 as the title for your zenity box. It is ignored by xmessage.
-# Send updates on stdin:
-# A line containing only a decimal integer from 0 - 100 sets that progress.
-# End with 100 to tell zenity to terminate.
-# A line starting with '#' replaces the progress text.
-# All other stdin lines are ignored.
-
-zenpath="$(which zenity)"
-if [ -n "$zenpath" -a -x "$zenpath" ]
-then # if executable zenity is on PATH, run that instead of this.
- exec "$zenpath" --progress --title="$1" --auto-close --width=320 --height=120
-fi
-
-# Arriving here means we don't have zenity available. The remainder of this
-# script is the xmessage wrapper.
-
-# We operate by leaving one background xmessage process running. This is the
-# pid of that process.
-xmpid=""
-
-function clear_message {
- [ -n "$xmpid" ] && kill $xmpid
- xmpid=""
-}
-
-# Cancel any pending xmessage, regardless of how we exit.
-trap 'clear_message' EXIT
-
-while read line
-do # terminate like zenity --progress
- [ "$line" == "100" ] && break
- # ignore everything but replacement text
- nohash="${line#'#'}"
- # if stripping leading hash doesn't change line, it doesn't have one
- [ "$nohash" == "$line" ] && continue
- # clear any previous message
- clear_message
- # put up a new xmessage and capture its pid
- xmessage -buttons OK:2 -center "$nohash" &
- xmpid=$!
-done
--
GitLab