[PC-BSD Commits] r7259 - in pcbsd/current: src-qt4/pc-sysmanager src-qt4/pc-sysmanager/scripts system-overlay/usr/PCBSD/Scripts/System

svn at pcbsd.org svn at pcbsd.org
Fri Jul 23 07:46:52 PDT 2010


Author: kris
Date: 2010-07-23 07:46:52 -0700 (Fri, 23 Jul 2010)
New Revision: 7259

Added:
   pcbsd/current/src-qt4/pc-sysmanager/scripts/
   pcbsd/current/src-qt4/pc-sysmanager/scripts/fastest_cvsup
   pcbsd/current/src-qt4/pc-sysmanager/scripts/portsnap.sh
Removed:
   pcbsd/current/system-overlay/usr/PCBSD/Scripts/System/changes.sh
   pcbsd/current/system-overlay/usr/PCBSD/Scripts/System/fastest_cvsup
   pcbsd/current/system-overlay/usr/PCBSD/Scripts/System/portsnap.sh
Modified:
   pcbsd/current/src-qt4/pc-sysmanager/fastestcvsup.cpp
   pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro
   pcbsd/current/src-qt4/pc-sysmanager/portsnapprogress.cpp
Log:

Added helper scripts to pc-sysmanager in /usr/local prefix



Modified: pcbsd/current/src-qt4/pc-sysmanager/fastestcvsup.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/fastestcvsup.cpp	2010-07-23 14:22:50 UTC (rev 7258)
+++ pcbsd/current/src-qt4/pc-sysmanager/fastestcvsup.cpp	2010-07-23 14:46:52 UTC (rev 7259)
@@ -21,7 +21,7 @@
 
     QStringList servers;
     serverMap = QMap<QString, QString>();
-    QFile file("/PCBSD/Scripts/System/fastest_cvsup");
+    QFile file("/usr/local/share/apps/pcbsd/scripts/fastest_cvsup");
     if (file.open(QIODevice::ReadOnly))
     {
 	QTextStream stream(&file);
@@ -54,7 +54,7 @@
 {
     mainWidget->setCurrentIndex(1);
     
-    QString prog = "/PCBSD/Scripts/System/fastest_cvsup";
+    QString prog = "/usr/local/share/apps/pcbsd/scripts/fastest_cvsup";
     QStringList args;
 
     args << "-m";

Modified: pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro	2010-07-23 14:22:50 UTC (rev 7258)
+++ pcbsd/current/src-qt4/pc-sysmanager/pc-sysmanager.pro	2010-07-23 14:46:52 UTC (rev 7259)
@@ -90,6 +90,12 @@
 desktop.path=/usr/local/share/applications/ 
 desktop.files=pcbsdsystem.desktop
 
-INSTALLS += dotrans desktop
+scripts.path = /usr/local/share/apps/pcbsd/scripts/
+scripts.files = scripts/*
 
+chmod.path=/usr/local/share/apps/pcbsd/scripts
+chmod.extra=cd /usr/local/share/apps/pcbsd/scripts && chmod 755 *
+
+INSTALLS += dotrans desktop scripts chmod
+
 QMAKE_LIBDIR = /usr/local/lib/qt4 /usr/local/lib

Modified: pcbsd/current/src-qt4/pc-sysmanager/portsnapprogress.cpp
===================================================================
--- pcbsd/current/src-qt4/pc-sysmanager/portsnapprogress.cpp	2010-07-23 14:22:50 UTC (rev 7258)
+++ pcbsd/current/src-qt4/pc-sysmanager/portsnapprogress.cpp	2010-07-23 14:46:52 UTC (rev 7259)
@@ -18,7 +18,7 @@
 void PortsnapProgress::init(bool usingPortConsole)
 {
     //Check our modified portsnap program is installed
-    QFile newsnap("/PCBSD/Scripts/System/portsnap.sh");
+    QFile newsnap("/usr/local/share/apps/pcbsd/scripts/portsnap.sh");
     if (! newsnap.exists()) {
 	QFile oldsnap("/usr/sbin/portsnap");
 	oldsnap.open(QIODevice::ReadOnly);
@@ -44,7 +44,7 @@
 	}
 	oldsnap.close();
 	newsnap.close();
-	chmod("/PCBSD/Scripts/System/portsnap.sh", 0755);
+	chmod("/usr/local/share/apps/pcbsd/scripts/portsnap.sh", 0755);
     }
     
     //Init vars
@@ -66,7 +66,7 @@
     
     QStringList args;
     QString prog;
-    prog = "/PCBSD/Scripts/System/portsnap.sh";
+    prog = "/usr/local/share/apps/pcbsd/scripts/portsnap.sh";
     args << "fetch";
     portsnap = new QProcess(this);
     portsnap->setProcessChannelMode(QProcess::MergedChannels);
@@ -116,7 +116,7 @@
 	
         QStringList args;
         QString prog;
-        prog = "/PCBSD/Scripts/System/portsnap.sh";
+        prog = "/usr/local/share/apps/pcbsd/scripts/portsnap.sh";
         args << "extract" << "update" << "-p" << portsdir ;
 	portsnap = new QProcess(this);
         portsnap->setProcessChannelMode(QProcess::MergedChannels);



More information about the Commits mailing list