Changeset dec6f67


Ignore:
Timestamp:
02/12/14 01:52:11 (11 months ago)
Author:
yurkis <yurkis@…>
Branches:
master, releng/10.0.1, releng/10.0.2, releng/10.0.3, releng/10.1
Children:
ffbf59c
Parents:
3f6d079 (diff), b02e573 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge remote-tracking branch 'upstream/master'

Files:
1 added
21 edited

Legend:

Unmodified
Added
Removed
  • build-files/conf/installcd-packages

    r9b48476c ra71cc41  
    4242qt4-inputmethods-\*.txz 
    4343nvidia-driver-\*.txz 
     44nvidia-settings-\*.txz 
     45nvidia-xconfig-\*.txz 
    4446xwd-\*.txz 
    4547xvkbd-\*.txz 
  • src-qt4/EasyPBI/EasyPBI.qrc

    rebba654 r8eaa615  
    55    <file>icons/cancel.png</file> 
    66    <file>icons/config.png</file> 
     7    <file>icons/window-close.png</file> 
    78    <file>icons/pcbsd.png</file> 
    89    <file>icons/freebsd.png</file> 
  • src-qt4/EasyPBI/backend.cpp

    r1f245a6 r8eaa615  
    1616  else if(icon=="help"){ iconPath.append("standardbutton-help-32.png"); } 
    1717  else if(icon=="open"){ iconPath.append("standardbutton-open-32.png"); } 
    18   else if(icon=="close"){ iconPath.append("standardbutton-close-32.png"); } 
    1918  else if(icon=="file"){ iconPath.append("file-32.png"); } 
    2019  else if(icon=="trash"){ iconPath.append("trash-32.png"); } 
     
    2322  else if(icon=="stop"){ iconPath.append("media-stop-32.png"); } 
    2423  //EasyPBI embedded resources (EasyPBI.qrc) 
     24  else if(icon=="close"){ iconPath = ":/png/icons/window-close.png"; } 
    2525  else if(icon=="easypbi"){ iconPath = ":/png/icons/EasyPBIicon.png"; } 
    2626  else if(icon=="freebsd"){ iconPath = ":/png/icons/freebsd.png"; } 
  • src-qt4/EasyPBI/mainGUI.cpp

    r1f245a6 r23d2792  
    443443void MainGUI::on_actionPBI_Modules_triggered(){ 
    444444  //Open the PC-BSD wiki to the module builders guide 
    445    QString target_url = "http://wiki.pcbsd.org/index.php/PBI_Module_Builder_Guide/9.2"; 
     445   QString target_url = "http://wiki.pcbsd.org/index.php/PBI_Module_Builder_Guide/10.0"; 
    446446   qDebug() << "Opening URL:" << target_url;  
    447447   target_url.prepend("xdg-open "); 
  • src-qt4/EasyPBI/mainGUI.ui

    rebba654 r8eaa615  
    259259             <y>0</y> 
    260260             <width>528</width> 
    261              <height>648</height> 
     261             <height>659</height> 
    262262            </rect> 
    263263           </property> 
     
    16381638     <y>0</y> 
    16391639     <width>575</width> 
    1640      <height>20</height> 
     1640     <height>21</height> 
    16411641    </rect> 
    16421642   </property> 
    16431643   <widget class="QMenu" name="menuFile"> 
    16441644    <property name="title"> 
    1645      <string>System</string> 
     1645     <string>File</string> 
    16461646    </property> 
    16471647    <addaction name="actionExit"/> 
     
    16491649   <widget class="QMenu" name="menuEdit"> 
    16501650    <property name="title"> 
    1651      <string>Options</string> 
     1651     <string>Configure</string> 
    16521652    </property> 
    16531653    <addaction name="actionPreferences"/> 
     
    16611661    </property> 
    16621662    <property name="title"> 
    1663      <string>Information</string> 
     1663     <string>Help</string> 
    16641664    </property> 
    16651665    <addaction name="actionAbout_EasyPBI"/> 
     
    17211721    <string>Open up the EasyPBI settings editor</string> 
    17221722   </property> 
     1723   <property name="shortcut"> 
     1724    <string>Shift+S</string> 
     1725   </property> 
    17231726  </action> 
    17241727  <action name="actionGet_Ports"> 
     
    18041807  </action> 
    18051808  <action name="actionExit"> 
     1809   <property name="icon"> 
     1810    <iconset resource="EasyPBI.qrc"> 
     1811     <normaloff>:/png/icons/window-close.png</normaloff>:/png/icons/window-close.png</iconset> 
     1812   </property> 
    18061813   <property name="text"> 
    1807     <string>Close EasyPBI</string> 
     1814    <string>Quit</string> 
    18081815   </property> 
    18091816   <property name="statusTip"> 
    18101817    <string>Close EasyPBI</string> 
     1818   </property> 
     1819   <property name="shortcut"> 
     1820    <string>Shift+Q</string> 
    18111821   </property> 
    18121822  </action> 
     
    18291839   </property> 
    18301840   <property name="text"> 
    1831     <string>About EasyPBI</string> 
     1841    <string>About</string> 
    18321842   </property> 
    18331843   <property name="statusTip"> 
    18341844    <string>View additional information about EasyPBI</string> 
     1845   </property> 
     1846   <property name="shortcut"> 
     1847    <string>Shift+A</string> 
    18351848   </property> 
    18361849  </action> 
  • src-qt4/PCDM/src/pcdm-backend.cpp

    r5e38281 rfefc988  
    469469  usernameList.clear(); displaynameList.clear(); homedirList.clear(); 
    470470  //Get all the users from the file "/etc/passwd" 
    471   QStringList uList = pcbsd::Utils::runShellCommand("cat /etc/passwd"); 
    472  
     471  QStringList uList; 
     472  QFile PWF("/etc/passwd"); 
     473  if( PWF.open(QIODevice::ReadOnly | QIODevice::Text) ){ 
     474    QTextStream in(&PWF); 
     475      in.setCodec( "UTF-8" ); 
     476    while( !in.atEnd() ){ 
     477      uList << QString( in.readLine() ); 
     478    } 
     479    PWF.close();     
     480  } 
    473481  //Remove all users that have: 
    474482  for(int i=0; i<uList.length(); i++){ 
  • src-qt4/life-preserver/lp-tray/LPTray.cpp

    rc4cd122 r9537cb2  
    129129    msgdlg->raise();  
    130130    msgdlg->show(); 
     131  }else if(!watcher->initPhase()){ 
     132    startGUI(); 
    131133  } 
    132134} 
  • src-qt4/life-preserver/lp-tray/LPWatcher.cpp

    r6a2483b r9537cb2  
    3838  timer = new QTimer(); 
    3939    connect(timer, SIGNAL(timeout()), this, SLOT(checkPoolStatus()) ); 
     40  iniTimer = new QTimer(); 
     41    connect(iniTimer, SIGNAL(timeout()), this, SLOT(endInitPhase()) ); 
     42    iniTimer->setSingleShot(true); 
    4043  //initialize the log file reader 
    4144  logfile = new QFile(FILE_LOG, this); 
     
    5760// ----------------------------------- 
    5861void LPWatcher::start(){ 
    59   if(!logfile->exists()){ 
    60     QString dir = FILE_LOG; 
    61           dir.chop( dir.section("/",-1).count()+1 ); 
    62     if(!QFile::exists(dir)){ system( QString("mkdir -p "+dir).toUtf8() ); } 
    63     system( QString("touch "+FILE_LOG).toUtf8() ); 
    64   } 
    65   //Read the current state of the log file 
    66   logfile->open(QIODevice::ReadOnly | QIODevice::Text); 
    67   readLogFile(true); //do this quietly the first time through 
    68   //Now start up the log file watcher 
    69   watcher->addPath(FILE_LOG); 
     62  INIT=true; 
     63  setupLogFile(); 
    7064  //Now check for any current errors in the LPbackend 
    7165  checkPoolStatus(); 
    7266  //And start up the error file watcher 
    7367  if(!timer->isActive()){ timer->start(sysCheckTime); } 
     68  iniTimer->start(30000); //30 seconds of initialization phase 
    7469} 
    7570 
     
    143138} 
    144139 
     140bool LPWatcher::initPhase(){ 
     141  return INIT; 
     142} 
    145143// ------------------------------------- 
    146144//    PRIVATE FUNCTIONS 
    147145// ------------------------------------- 
     146void LPWatcher::setupLogFile(){ 
     147 //Tray now has user permissions and cannot create files/dirs in /var 
     148 /*if(!logfile->exists()){ 
     149    QString dir = FILE_LOG; 
     150          dir.chop( dir.section("/",-1).count()+1 ); 
     151    if(!QFile::exists(dir)){ system( QString("mkdir -p "+dir).toUtf8() ); } 
     152    system( QString("touch "+FILE_LOG).toUtf8() ); 
     153  }*/ 
     154         
     155  //Read the current state of the log file 
     156  if(logfile->exists()){ 
     157    logfile->open(QIODevice::ReadOnly | QIODevice::Text); 
     158    readLogFile(true); //do this quietly the first time through 
     159    //Now start up the log file watcher 
     160    watcher->addPath(FILE_LOG);  
     161  } 
     162} 
     163 
    148164void LPWatcher::readLogFile(bool quiet){ 
    149165  QStringList reppools = listReplicatedPools(); 
     
    386402 
    387403void LPWatcher::checkPoolStatus(){ 
     404  if(watcher->files().isEmpty()){ 
     405    setupLogFile(); //try it now - might have been created in the meantime 
     406  } 
    388407  //Now check zpool status for bad/running statuses 
    389408  QStringList zstat = getCmdOutput("zpool status"); 
     
    579598  else{ emit StatusUpdated(); } 
    580599} 
     600 
     601void LPWatcher::endInitPhase(){ 
     602  INIT=false; 
     603} 
  • src-qt4/life-preserver/lp-tray/LPWatcher.h

    r6a2483b r9537cb2  
    2525        bool isRunning(); 
    2626        bool hasError(); 
     27        bool initPhase(); 
    2728 
    2829public slots: 
     
    3839        //File system watcher 
    3940        QFileSystemWatcher *watcher; 
    40         QTimer *timer; 
     41        QTimer *timer, *iniTimer; 
    4142        int sysCheckTime; 
    4243        QFile *logfile, *repfile; 
     
    4445        //Replication size variables 
    4546        QString repTotK, lastSize; 
     47        bool INIT; 
    4648 
     49        void setupLogFile(); 
    4750        void readLogFile(bool quiet = false); 
    4851        void readReplicationFile(); //always sends quiet signals 
     
    6063        void fileChanged(QString); //file system watcher saw a change 
    6164        void checkPoolStatus(); //check for serious system errors 
     65        void endInitPhase(); 
    6266 
    6367signals: 
  • src-qt4/pc-mounttray/fsWatcher.cpp

    r5675b55 ra4c888d  
    5252    else if(dfout[i].startsWith("linprocfs")){} 
    5353    else if(dfout[i].startsWith("linsysfs")){} 
     54    else if(dfout[i].startsWith("fdescfs")){} 
    5455    else{ 
    5556      //Now parse out the info   
  • src-sh/pbi-manager/pbime/pbimount

    r521677a r064e485a  
    9797 
    9898   is_mounted "${pDir}/virtbase/dev" || (mount -t devfs devfs "${pDir}/virtbase/dev" ; $MNTSLEEP ) 
     99   is_mounted "${pDir}/virtbase/dev/fd" || (mount -t fdescfs fdesc "${pDir}/virtbase/dev/fd" ; $MNTSLEEP ) 
    99100   is_mounted "${pDir}/virtbase/usr/local" || ($NULLFS ${1}/local "${pDir}/virtbase/usr/local" ; $MNTSLEEP ) 
    100101   is_mounted "${pDir}/virtbase/var/run" || ($NULLFS ${pDir}/run "${pDir}/virtbase/var/run" ; $MNTSLEEP ) 
  • src-sh/pc-sysinstall/backend/functions-cleanup.sh

    r3018894 r772cd3d  
    238238    echo "procfs                        /proc                   procfs          rw              0       0" >> ${FSTAB} 
    239239    echo "linprocfs             /compat/linux/proc      linprocfs       rw              0       0" >> ${FSTAB} 
     240    echo "fdesc                 /dev/fd         fdescfs         rw      0       0" >> ${FSTAB} 
    240241  fi 
    241242 
  • src-qt4/libpcbsd/utils/pcbsd-utils.h

    r7c7f02c r3f6d079  
    5151    bool    isActive;      ///< True if DE is active now 
    5252    bool    isXDG;         ///< True if DE is XDG compatible 
     53    QString ConfigurationApplication; 
    5354    QString TerminalCommand; 
    5455    QString TerminalTitleKey; 
  • src-qt4/libpcbsd/utils/utils.cpp

    re3174a0a r3f6d079  
    837837    static const char* const DE_FILE_MANAGER = "File manager:"; 
    838838    static const char* const DE_TERMINAL = "Terminal:"; 
     839    static const char* const DE_CONFIG_APP = "Configuration app:"; 
    839840 
    840841    retVal.clear(); 
     
    871872        TRY_GET_VALUE_STR(DE_FILE_MANAGER, FileManager); 
    872873        TRY_GET_VALUE_STR(DE_TERMINAL, TerminalCommand); 
     874        TRY_GET_VALUE_STR(DE_CONFIG_APP, ConfigurationApplication); 
    873875        //TODO: another fields 
    874876    }//while process output reading 
  • src-sh/de-info/de-info

    r1620346 r3f6d079  
    4545    fi 
    4646      echo "XDG compatible: $XDG" 
     47       
     48      if [ -n "$DE_CONFIG_APP" ] ; then 
     49      echo "Configuration app: $DE_CONFIG_APP" 
     50      fi 
    4751      echo "Sudo command: $DE_SU"   
    4852      echo "File manager: $DE_FILEMAN" 
     
    5357} 
    5458 
     59check_instaled() 
     60{ 
     61  if [ -n "$DE_METAPACKAGE" ] 
     62  then 
     63    pc-metapkgmanager status $DE_METAPACKAGE | grep "is installed" >/dev/null 
     64    if [ $? -eq 0 ] ; then 
     65      DE_INSTALLED=1 
     66    fi 
     67  fi 
     68  if [ -n "$DE_INSTALL_FILE"  ] 
     69  then 
     70    for I_FILE in $DE_INSTALL_FILE 
     71    do 
     72      which $I_FILE >/dev/null 2>/dev/null 
     73      if [ $? -eq 0 ] ; then 
     74        DE_INSTALLED=1  
     75      fi 
     76    done 
     77  fi  
     78   
     79  if [ -n "$DE_METAPACKAGE" ] && [ -n "$DE_INSTALL_FILE" ] 
     80  then       
     81    installed 
     82  fi 
     83} 
     84 
     85check_active() 
     86{ 
     87  if [ -n "$DE_SESSION_NAME" ] 
     88  then 
     89    if [ "$DE_SESSION_NAME" == "$PCDM_SESSION" ] ; then 
     90      DE_ACTIVE=1 
     91  fi 
     92  else 
     93    active   
     94  fi 
     95} 
     96 
    5597parse_all() 
    5698{ 
     
    59101  DE_NAME="" 
    60102  XDG="" 
     103  DE_CONFIG_APP="" 
     104  DE_METAPACKAGE="" 
     105  DE_INSTALL_FILE="" 
     106  DE_SESSION_NAME="" 
    61107  DE_SU=$DEFAULT_SUDO 
    62108  DE_FILEMAN="" 
     
    68114  DE_ACTIVE=0 
    69115 
    70   . $PROF 
    71  
    72   active 
    73   installed 
    74  
     116  . $PROF   
     117 
     118  check_instaled 
     119  check_active 
     120   
    75121  if  [ $DE_ACTIVE -eq 1 ] ||  ( [ $DE_INSTALLED -eq 1 ] && [ $SHOW_INSTALLED -eq 1 ] ) || [ $SHOW_ALL -eq 1 ] 
    76122  then 
     
    89135  DE_NAME="" 
    90136  XDG="" 
     137  DE_CONFIG_APP="" 
     138  DE_METAPACKAGE="" 
     139  DE_INSTALL_FILE="" 
     140  DE_SESSION_NAME="" 
    91141  DE_TERMINAL=$DEFAULT_TERMINAL 
    92142  DE_FILEMAN="" 
     
    101151  . $PROF 
    102152 
    103   active 
     153  check_active 
    104154 
    105155  if [ $DE_ACTIVE -eq 1 ] ; then 
     
    120170 
    121171 
     172 
    122173if [ "$1" = "-help" ] || [ "$1" = "--help" ] || [ "$1" = "-?" ]  
    123174then 
  • src-sh/de-info/de-profiles/cinnamon.profile

    r04d2faf r3f6d079  
    11DE_NAME="Cinnamon" 
    22XDG="YES" 
     3 
     4DE_SESSION_NAME="CINNAMON" 
     5DE_METAPACKAGE="Cinnamon" 
     6DE_INSTALL_FILE="gnome-session-cinnamon" 
     7 
     8DE_CONFIG_APP="cinnamon-settings" 
     9 
    310DE_SU="pc-su %s" 
    411DE_FILEMAN="nautilus %s" 
     
    613DE_TERMINAL_TITLE="-t" 
    714DE_TERMINAL_COMMAND="-e" 
    8 DE_SESSION_NAME="CINNAMON" 
    915 
    10 active() { 
    11 #if [ "$DESKTOP_SESSION" = "cinnamon" ] || [ "$DESKTOP_SESSION" = "32Cinnamon" ] || [ "$DESKTOP_SESSION" = "openbox-cinnamon"  ] || [ ! -z $CINNAMON_VERSION ]; then 
    12 if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
    13 DE_ACTIVE=1 
    14 fi   
    1516 
    16 } 
    17  
    18 installed() { 
    19 # Check via pc-metapkgmanager if it exists 
    20 which pc-metapkgmanager >/dev/null 2>/dev/null 
    21 if [ $? -eq 0 ] ; then 
    22   pc-metapkgmanager status Cinnamon | grep "is installed" >/dev/null 
    23   if [ $? -eq 0 ] ; then 
    24     DE_INSTALLED=1 
    25   fi 
    26 else 
    27   which gnome-session-cinnamon >/dev/null 2>/dev/null 
    28   if [ $? -eq 0 ] ; then 
    29     DE_INSTALLED=1 
    30   fi 
    31 fi 
    32  
    33 } 
  • src-sh/de-info/de-profiles/gnome.profile

    r5e46078 r3f6d079  
    11DE_NAME="Gnome" 
    22XDG="NO" 
     3 
     4DE_SESSION_NAME="GNOME" 
     5DE_METAPACKAGE="KDE" 
     6DE_INSTALL_FILE="gnome-session" 
     7 
     8DE_CONFIG_APP="gnome-control-center --overview" 
     9 
    310DE_SU="gksu %s" 
    411DE_FILEMAN="nautilus %s" 
     
    613DE_TERMINAL_TITLE="-t" 
    714DE_TERMINAL_COMMAND="-e" 
    8 DE_SESSION_NAME="GNOME" 
    915 
    10 active() { 
    11 if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
    12 DE_ACTIVE=1 
    13 fi   
    14  
    15 } 
    16  
    17 installed() { 
    18 # Check via pc-metapkgmanager if it exists 
    19 which pc-metapkgmanager >/dev/null 2>/dev/null 
    20 if [ $? -eq 0 ] ; then 
    21   pc-metapkgmanager status GNOME | grep "is installed" >/dev/null 
    22   if [ $? -eq 0 ] ; then 
    23     DE_INSTALLED=1 
    24   fi 
    25 else 
    26   which gnome-session >/dev/null 2>/dev/null 
    27   if [ $? -eq 0 ] ; then 
    28     DE_INSTALLED=1 
    29   fi 
    30 fi 
    31  
    32 } 
  • src-sh/de-info/de-profiles/kde.profile

    r04d2faf r3f6d079  
    11DE_NAME="KDE" 
    22XDG="YES" 
     3 
     4DE_SESSION_NAME="KDE" 
     5DE_METAPACKAGE="KDE" 
     6DE_INSTALL_FILE="_startkde4  _startkde" 
     7 
     8DE_CONFIG_APP="systemsettings" 
    39 
    410DE_SU="kdesu %s" 
     
    814DE_TERMINAL_SEPARATE_ARGS="YES" 
    915DE_FILEMAN="dolphin %s" 
    10 DE_SESSION_NAME="KDE" 
    1116 
    12 active() { 
    13  
    14  if [ -n "$KDE_SESSION_UID" ] || [ "${XDG_CURRENT_DESKTOP}" == "KDE" ] || [ "$DE_SESSION_NAME" == "$PCDM_SESSION" ] ; then 
    15     DE_ACTIVE=1 
    16  fi 
    17  
    18 } 
    19  
    20  
    21 installed() 
    22 { 
    23 # Check via pc-metapkgmanager if it exists 
    24 which pc-metapkgmanager >/dev/null 2>/dev/null 
    25 if [ $? -eq 0 ] ; then 
    26   pc-metapkgmanager status KDE | grep "is installed" >/dev/null 
    27   if [ $? -eq 0 ] ; then 
    28     DE_INSTALLED=1 
    29   fi 
    30 else 
    31   which startkde4 >/dev/null 2>/dev/null 
    32   if [ $? -eq 0 ] ; then 
    33     DE_INSTALLED=1 
    34   fi 
    35   which startkde >/dev/null 2>/dev/null 
    36   if [ $? -eq 0 ] ; then 
    37     DE_INSTALLED=1 
    38   fi 
    39 fi 
    40  
    41 } 
  • src-sh/de-info/de-profiles/lxde.profile

    r04d2faf rdea54da  
    22DE_NAME="LXDE" 
    33XDG="YES" 
     4 
     5DE_SESSION_NAME="LXDE" 
     6DE_METAPACKAGE="LXDE" 
     7DE_INSTALL_FILE="startlxde" 
     8 
    49DE_FILEMAN="pcmanfm %s" 
    510DE_TERMINAL="lxterminal" 
    611DE_TERMINAL_TITLE="-T" 
    712DE_TERMINAL_COMMAND="-e" 
    8 DE_SESSION_NAME="LXDE" 
    913 
    10 active() 
    11 { 
    12 if [ "$DESKTOP_SESSION" = "LXDE" ] || [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
    13 DE_ACTIVE=1 
    14 fi 
    15 } 
    16  
    17 installed() 
    18 { 
    19 # Check via pc-metapkgmanager if it exists 
    20 which pc-metapkgmanager >/dev/null 2>/dev/null 
    21 if [ $? -eq 0 ] ; then 
    22   pc-metapkgmanager status LXDE | grep "is installed" >/dev/null 
    23   if [ $? -eq 0 ] ; then 
    24     DE_INSTALLED=1 
    25   fi 
    26 else 
    27   which startlxde >/dev/null 2>/dev/null 
    28   if [ $? -eq 0 ] ; then 
    29     DE_INSTALLED=1 
    30   fi 
    31 fi 
    32 } 
  • src-sh/de-info/de-profiles/mate.profile

    r04d2faf rdea54da  
    11DE_NAME="Mate" 
    22XDG="YES" 
     3 
     4DE_SESSION_NAME="MATE" 
     5DE_METAPACKAGE="Mate" 
     6DE_INSTALL_FILE="mate-session" 
     7 
    38DE_SU="pc-su %s" 
    49DE_FILEMAN="nautilus %s" 
     
    611DE_TERMINAL_TITLE="-t" 
    712DE_TERMINAL_COMMAND="-e" 
    8 DE_SESSION_NAME="MATE" 
    913 
    10 active() { 
    11 if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
    12 DE_ACTIVE=1 
    13 fi   
    1414 
    15 } 
    16  
    17 installed() { 
    18 # Check via pc-metapkgmanager if it exists 
    19 which pc-metapkgmanager >/dev/null 2>/dev/null 
    20 if [ $? -eq 0 ] ; then 
    21   pc-metapkgmanager status Mate | grep "is installed" >/dev/null 
    22   if [ $? -eq 0 ] ; then 
    23     DE_INSTALLED=1 
    24   fi 
    25 else 
    26   which mate-session >/dev/null 2>/dev/null 
    27   if [ $? -eq 0 ] ; then 
    28     DE_INSTALLED=1 
    29   fi 
    30 fi 
    31  
    32 } 
  • src-sh/de-info/de-profiles/xfce.profile

    r04d2faf r3f6d079  
    11#!/bin/sh 
    22DE_NAME="XFCE" 
     3 
     4DE_SESSION_NAME="XFCE" 
     5DE_METAPACKAGE="XFCE" 
     6DE_INSTALL_FILE="startxfce4 startxfce" 
     7 
     8DE_CONFIG_APP="xfce4-settings-manager" 
     9 
    310XDG="YES" 
    411DE_SU="pc-su %s" 
     
    714DE_TERMINAL_TITLE="-T" 
    815DE_TERMINAL_COMMAND="-e" 
    9 DE_SESSION_NAME="XFCE" 
    10  
    11 active() { 
    12 if [ "$PCDM_SESSION" = "$DE_SESSION_NAME" ]; then 
    13 DE_ACTIVE=1 
    14 fi   
    15  
    16 } 
    17  
    18 installed() 
    19 { 
    20 # Check via pc-metapkgmanager if it exists 
    21 which pc-metapkgmanager >/dev/null 2>/dev/null 
    22 if [ $? -eq 0 ] ; then 
    23   pc-metapkgmanager status XFCE | grep "is installed">/dev/null 
    24   if [ $? -eq 0 ] ; then 
    25     DE_INSTALLED=1 
    26   fi 
    27 else 
    28   which startxfce4 >/dev/null 2>/dev/null 
    29   if [ $? -eq 0 ] ; then 
    30     DE_INSTALLED=1 
    31   fi 
    32   which startxfce >/dev/null 2>/dev/null 
    33   if [ $? -eq 0 ] ; then 
    34     DE_INSTALLED=1 
    35   fi 
    36 fi 
    37 } 
Note: See TracChangeset for help on using the changeset viewer.