Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Puppet_Master (d8b1ba3d5074b8dcdf409fd2722d92260cbb5321)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Puppet_Master <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Puppet_Master (d8b1ba3d5074b8dcdf409fd2722d92260cbb5321)
  • Date: Wed, 9 Dec 2009 08:30:16 -0600

GIT changes to master grimoire by Puppet_Master <puppetmaster AT sourcemage.org>:

gurus.gpg |binary
x11/freenx/FINAL | 23 ++++++++++++-----------
x11/freenx/HISTORY | 3 +++
x11/freenx/INSTALL | 9 +++++----
4 files changed, 20 insertions(+), 15 deletions(-)

New commits:
commit d8b1ba3d5074b8dcdf409fd2722d92260cbb5321
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

Updating guru.gpg file with my new gpg key

commit d79607bb6e6995932c4215cec1a2c7f180538689
Author: Philippe Caseiro <puppetmaster AT sourcemage.org>
Commit: Puppet_Master <puppetmaster AT sourcemage.org>

freenx: spell cast fixed
Better usage of persistent_add (I think, because now it casts fine)

diff --git a/gurus.gpg b/gurus.gpg
index 1ec1753..cbae94e 100644
Binary files a/gurus.gpg and b/gurus.gpg differ
diff --git a/x11/freenx/FINAL b/x11/freenx/FINAL
index f3d98cc..554f5f0 100755
--- a/x11/freenx/FINAL
+++ b/x11/freenx/FINAL
@@ -1,18 +1,19 @@
I_R=${INSTALL_ROOT}
USRBIN=${I_R}/usr/bin

-persistent_add $(grep ^NX_DIR ${USRBIN}/nxloadconfig)
-persistent_add $(grep ^NX_HOME_DIR ${USRBIN}/nxloadconfig)
-persistent_add $(grep ^NX_SESS_DIR ${USRBIN}/nxloadconfig)
-persistent_add $(grep ^NX_ETC_DIR ${USRBIN}/nxloadconfig)
-persistent_add $(grep ^NX_LOGFILE ${USRBIN}/nxloadconfig)
-persistent_add $(grep ^SSH_AUTHORIZED_KEYS ${USRBIN}/nxloadconfig)
-
-touch ${I_R}${NX_ETC_DIR}/passwords \
+FREENX_VARS="NX_DIR NX_HOME_DIR NX_SESS_DIR NX_ETC_DIR NX_LOGFILE
SSH_AUTHORIZED_KEYS"
+
+for var in ${FREENX_VARS}; do
+ persistent_add $var
+ eval "$(grep "^$var" ${USRBIN}/nxloadconfig)"
+done &&
+
+touch ${I_R}${NX_ETC_DIR}/passwords \
${I_R}${NX_ETC_DIR}/passwords.orig \
- ${I_R}${NX_LOGFILE}
-chmod 600 ${I_R}${NX_ETC_DIR}/pass* \
- ${I_R}${NX_LOGFILE}
+ ${I_R}${NX_LOGFILE} &&
+
+chmod 600 ${I_R}${NX_ETC_DIR}/pass* \
+ ${I_R}${NX_LOGFILE} &&

if [ ! -e ${I_R}${NX_ETC_DIR}/users.id_dsa ]
then
diff --git a/x11/freenx/HISTORY b/x11/freenx/HISTORY
index d37ae4a..7752fba 100644
--- a/x11/freenx/HISTORY
+++ b/x11/freenx/HISTORY
@@ -1,3 +1,6 @@
+2009-12-09 Philippe "Puppet_Master" Caseiro <puppetmaster AT sourcemage.org>
+ * FINAL, INSTALL: fixing persistent_add use to make spell cast
+
2008-03-11 Ismael Luceno <ismael AT sourcemage.org>
* FINAL, INSTALL: use persistent_add instead of export

diff --git a/x11/freenx/INSTALL b/x11/freenx/INSTALL
index 547cb5a..da36b7e 100755
--- a/x11/freenx/INSTALL
+++ b/x11/freenx/INSTALL
@@ -1,11 +1,12 @@
I_R=${INSTALL_ROOT}

FREENX_PROGS="nxclient nxnode nxkeygen nxnode-login nxserver nxprint nxsetup
nxloadconfig"
+FREENX_VARS="NX_DIR NX_HOME_DIR NX_SESS_DIR NX_ETC_DIR"

-persistent_add $(grep ^NX_DIR ${SOURCE_DIRECTORY}/nxloadconfig) &&
-persistent_add $(grep ^NX_HOME_DIR ${SOURCE_DIRECTORY}/nxloadconfig) &&
-persistent_add $(grep ^NX_SESS_DIR ${SOURCE_DIRECTORY}/nxloadconfig) &&
-persistent_add $(grep ^NX_ETC_DIR ${SOURCE_DIRECTORY}/nxloadconfig) &&
+for var in ${FREENX_VARS}; do
+ persistent_add $var
+ eval "$(grep ^$var ${SOURCE_DIRECTORY}/nxloadconfig)"
+done

mkdir -p ${I_R}${NX_HOME_DIR} &&
mkdir -p ${I_R}${NX_ETC_DIR} &&



  • [SM-Commit] GIT changes to master grimoire by Puppet_Master (d8b1ba3d5074b8dcdf409fd2722d92260cbb5321), Puppet_Master, 12/09/2009

Archive powered by MHonArc 2.6.24.

Top of Page