Use LF carriage control in shell scripts to fix build under Linux

This commit is contained in:
entropy 2012-02-02 22:57:02 +00:00
parent 8cd027b036
commit fb1edaf1e4
2 changed files with 71 additions and 71 deletions

View File

@ -1,30 +1,30 @@
#!/bin/bash
FILENAME=source/loader/alt_ios_gen.c
GENERATE=0
VERSION=249
if [ ! -z "$1" ];
then
VERSION=$1
fi
if [ ! -f $FILENAME ];
then
GENERATE=1
else
CURRENT_VERSION=`grep mainIOS\ = $FILENAME | awk '{printf "%d", $4}'`
if [ $CURRENT_VERSION -ne $VERSION ];
then
GENERATE=1
fi
fi
if [ $GENERATE -eq 1 ];
then
cat <<EOF > $FILENAME
#include "alt_ios.h"
int mainIOS = $VERSION;
EOF
#!/bin/bash
FILENAME=source/loader/alt_ios_gen.c
GENERATE=0
VERSION=249
if [ ! -z "$1" ];
then
VERSION=$1
fi
if [ ! -f $FILENAME ];
then
GENERATE=1
else
CURRENT_VERSION=`grep mainIOS\ = $FILENAME | awk '{printf "%d", $4}'`
if [ $CURRENT_VERSION -ne $VERSION ];
then
GENERATE=1
fi
fi
if [ $GENERATE -eq 1 ];
then
cat <<EOF > $FILENAME
#include "alt_ios.h"
int mainIOS = $VERSION;
EOF
fi

View File

@ -1,42 +1,42 @@
#! /bin/bash
#
rev_new_raw=$(svnversion -n . 2>/dev/null | tr '\n' ' ' | tr -d '\r')
[ -n "$rev_new_raw" ] || rev_new_raw=$(SubWCRev . 2>/dev/null | tr '\n' ' ' | tr -d '\r')
if [ "$rev_new_raw" == "exported" ];
then
echo This copy of wiiflow is not under source control
exit
fi
rev_new_raw=$(echo $rev_new_raw | sed 's/[^0-9]*\([0-9]*\)\(.*\)/\1 \2/')
rev_new=0
a=$(echo $rev_new_raw | sed 's/\([0-9]*\).*/\1/')
let "a+=0"
#find max rev
while [ "$a" ]; do
[ "$a" -gt "$rev_new" ] && rev_new=$a
rev_new_raw=$(echo -n $rev_new_raw | sed 's/[0-9]*[^0-9]*\([0-9]*\)\(.*\)/\1 \2/')
a=$(echo $rev_new_raw | sed 's/\([0-9]*\).*/\1/')
done
rev_old=$(cat ./source/svnrev.h 2>/dev/null | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
if [ "$rev_new" != "$rev_old" ] || [ ! -f ./source/svnrev.h ]; then
cat <<EOF > ./source/svnrev.h
#define SVN_REV "$rev_new"
EOF
if [ -n "$rev_old" ]; then
echo "Changed Rev $rev_old to $rev_new" >&2
else
echo "svnrev.h created" >&2
fi
rev_new=`expr $rev_new + 1`
rev_date=`date +%Y%m%d%H%M -u`
fi
#! /bin/bash
#
rev_new_raw=$(svnversion -n . 2>/dev/null | tr '\n' ' ' | tr -d '\r')
[ -n "$rev_new_raw" ] || rev_new_raw=$(SubWCRev . 2>/dev/null | tr '\n' ' ' | tr -d '\r')
if [ "$rev_new_raw" == "exported" ];
then
echo This copy of wiiflow is not under source control
exit
fi
rev_new_raw=$(echo $rev_new_raw | sed 's/[^0-9]*\([0-9]*\)\(.*\)/\1 \2/')
rev_new=0
a=$(echo $rev_new_raw | sed 's/\([0-9]*\).*/\1/')
let "a+=0"
#find max rev
while [ "$a" ]; do
[ "$a" -gt "$rev_new" ] && rev_new=$a
rev_new_raw=$(echo -n $rev_new_raw | sed 's/[0-9]*[^0-9]*\([0-9]*\)\(.*\)/\1 \2/')
a=$(echo $rev_new_raw | sed 's/\([0-9]*\).*/\1/')
done
rev_old=$(cat ./source/svnrev.h 2>/dev/null | tr -d '\n' | sed 's/[^0-9]*\([0-9]*\).*/\1/')
if [ "$rev_new" != "$rev_old" ] || [ ! -f ./source/svnrev.h ]; then
cat <<EOF > ./source/svnrev.h
#define SVN_REV "$rev_new"
EOF
if [ -n "$rev_old" ]; then
echo "Changed Rev $rev_old to $rev_new" >&2
else
echo "svnrev.h created" >&2
fi
rev_new=`expr $rev_new + 1`
rev_date=`date +%Y%m%d%H%M -u`
fi