Changeset 13498


Ignore:
Timestamp:
Sep 17, 2012, 8:34:46 PM (9 years ago)
Author:
livings124
Message:

revert formatting changes in r13497

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/third-party/miniupnp/updateminiupnpcstrings.sh

    r13497 r13498  
    66FILE=$3
    77TMPFILE=$3.tmp
    8 echo "1 $VERSION_FILE"
    9 echo "2 $TEMPLATE_FILE"
    10 echo "3 $FILE"
    11 echo "4 $TMPFILE"
    12 
    138
    149# detecting the OS name and version
     
    1611OS_VERSION=`uname -r`
    1712if [ -f /etc/debian_version ]; then
    18 OS_NAME=Debian
    19 OS_VERSION=`cat /etc/debian_version`
     13    OS_NAME=Debian
     14    OS_VERSION=`cat /etc/debian_version`
    2015fi
    2116# use lsb_release (Linux Standard Base) when available
    2217LSB_RELEASE=`which lsb_release`
    2318if [ 0 -eq $? -a -x "${LSB_RELEASE}" ]; then
    24 OS_NAME=`${LSB_RELEASE} -i -s`
    25 OS_VERSION=`${LSB_RELEASE} -r -s`
    26 case $OS_NAME in
    27 Debian)
    28 #OS_VERSION=`${LSB_RELEASE} -c -s`
    29 ;;
    30 Ubuntu)
    31 #OS_VERSION=`${LSB_RELEASE} -c -s`
    32 ;;
    33 esac
     19    OS_NAME=`${LSB_RELEASE} -i -s`
     20    OS_VERSION=`${LSB_RELEASE} -r -s`
     21    case $OS_NAME in
     22        Debian)
     23        #OS_VERSION=`${LSB_RELEASE} -c -s`
     24        ;;
     25    Ubuntu)
     26        #OS_VERSION=`${LSB_RELEASE} -c -s`
     27        ;;
     28    esac
    3429fi
    3530
    3631# on AmigaOS 3, uname -r returns "unknown", so we use uname -v
    3732if [ "$OS_NAME" = "AmigaOS" ]; then
    38 if [ "$OS_VERSION" = "unknown" ]; then
    39 OS_VERSION=`uname -v`
    40 fi
     33    if [ "$OS_VERSION" = "unknown" ]; then
     34        OS_VERSION=`uname -v`
     35    fi
    4136fi
    4237
     
    4641
    4742EXPR="s|OS_STRING \".*\"|OS_STRING \"${OS_NAME}/${OS_VERSION}\"|"
    48 echo $EXPR
     43#echo $EXPR
    4944test -f ${FILE}.in
    5045echo "setting OS_STRING macro value to ${OS_NAME}/${OS_VERSION} in $FILE."
Note: See TracChangeset for help on using the changeset viewer.