Diff for /freem/scripts/_fmd_common.bash between versions 1.4 and 1.7

version 1.4, 2025/04/07 05:19:15 version 1.7, 2025/04/14 14:34:07
Line 23 Line 23
 #   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.  #   along with FreeM.  If not, see <https://www.gnu.org/licenses/>.
 #  #
 #   $Log$  #   $Log$
   #   Revision 1.7  2025/04/14 14:34:07  snw
   #   Fix _fmd_common.bash syntax error
   #
   #   Revision 1.6  2025/04/14 13:06:46  snw
   #   Add OS/2 RPM build script to fmd
   #
   #   Revision 1.5  2025/04/10 15:27:39  snw
   #   Detect Devuan distribution and fix OS/2 problem with iniconf.c
   #
 #   Revision 1.4  2025/04/07 05:19:15  snw  #   Revision 1.4  2025/04/07 05:19:15  snw
 #   Initial work on moving rpm packaging to fmd  #   Initial work on moving rpm packaging to fmd
 #  #
Line 49  function _fmd_os_detect() Line 58  function _fmd_os_detect()
           
     case $_fmd_kernel in      case $_fmd_kernel in
   
           "os/2")
               export _fmd_arch=i386
               export _fmd_subarch=i386
               export _fmd_osversion=$(echo "${_fmd_uname}" | cut -d" " -f3)
               export _fmd_distribution="OS/2"
               export _fmd_distfamily="OS/2"
               export _fmd_can_package=1
               export _fmd_pkg_mechanism=os2rpm
               ;;
           
         sunos)          sunos)
             export _fmd_arch=$(isainfo | cut -d" " -f2)              export _fmd_arch=$(isainfo | cut -d" " -f2)
             export _fmd_subarch=$(isainfo | cut -d" " -f1)              export _fmd_subarch=$(isainfo | cut -d" " -f1)
Line 179  function _fmd_os_detect() Line 198  function _fmd_os_detect()
                     export _fmd_can_package=0                      export _fmd_can_package=0
                     export _fmd_pkg_mechanism="pacman"                      export _fmd_pkg_mechanism="pacman"
                     ;;                      ;;
                   
                   devuan)
                       export _fmd_distribution="devuan"
                       export _fmd_distfamily="debian"
                       export _fmd_can_package=1
                       export _fmd_pkg_mechanism="dpkg"
                       ;;
                      
                 debian)                  debian)
                     export _fmd_distribution="debian"                      export _fmd_distribution="debian"
                     export _fmd_distfamily="debian"                      export _fmd_distfamily="debian"
Line 263  function _fmd_loadconfig() Line 289  function _fmd_loadconfig()
 {  {
     export _fmd_cvsuser=$(cat "${_fmd_rc}" | grep "user=" | cut -d= -f2)      export _fmd_cvsuser=$(cat "${_fmd_rc}" | grep "user=" | cut -d= -f2)
     export _fmd_email=$(cat "${_fmd_rc}" | grep "email=" | cut -d= -f2)      export _fmd_email=$(cat "${_fmd_rc}" | grep "email=" | cut -d= -f2)
     export _fmd_fullname=$(cat "${_fmd_rc}" | grep "fullname=" | cut -d= -f2)          export _fmd_fullname=$(cat "${_fmd_rc}" | grep "fullname=" | cut -d= -f2)
       export _fmd_mantis_key=$(cat "${_fmd_rc}" | grep "mantis_key=" | cut -d= -f2)    
 }  }
   
 function _fmd_reconfig()  function _fmd_reconfig()
Line 276  function _fmd_reconfig() Line 303  function _fmd_reconfig()
     read _fmd_email      read _fmd_email
     echo -n "What is your full name? "      echo -n "What is your full name? "
     read _fmd_fullname      read _fmd_fullname
       echo -n "What is your Mantis API key? "
       read _fmd_mantis_key
     echo "user=${_fmd_cvsuser}" > "${_fmd_rc}"      echo "user=${_fmd_cvsuser}" > "${_fmd_rc}"
     echo "email=${_fmd_email}" >> "${_fmd_rc}"      echo "email=${_fmd_email}" >> "${_fmd_rc}"
     echo "fullname=${_fmd_fullname}" >> "${_fmd_rc}"      echo "fullname=${_fmd_fullname}" >> "${_fmd_rc}"
       echo "mantis_key=${_fmd_mantis_key}" >> "${_fmd_rc}"
     echo      echo
     echo "fmd:  wrote ${_fmd_rc}"      echo "fmd:  wrote ${_fmd_rc}"
 }  }

Removed from v.1.4  
changed lines
  Added in v.1.7


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>