...
 
Commits (2)
......@@ -35,7 +35,7 @@ init()
# This is an arbitraty choice, but for now it works.
pvsshome=$(
sed -n '/^\[Software\\ETM\\PVSS II\\[0-9]\+\.[0-9]\+\]$/,/^\[/ {
s,^InstallationDir *= *"\([^"]*\)"$,\1,p }' $PVSSINST_CONF | sort -u | head -n 1
s,^InstallationDir *= *"\([^"]*\)"$,\1,p }' $PVSSINST_CONF | sort -ur | head -n 1
)
echo "Found pvsshome=$pvsshome in $PVSSINST_CONF"
......@@ -61,7 +61,7 @@ pvss_cmdprefix()
{
pvss_version=$(
sed -n 's,^\[Software\\ETM\\PVSS II\\\([0-9]\+\.[0-9]\+\)\]$,\1,p' \
$PVSSINST_CONF | sort -u | head -n 1)
$PVSSINST_CONF | sort -ur | head -n 1)
pvss_version_major=$(echo $pvss_version | cut -d'.' -f1)
pvss_version_minor=$(echo $pvss_version | cut -d'.' -f2)
......@@ -88,7 +88,7 @@ pvss_import_dplist()
pvss_project_config()
{
currentProj=$(
sed -n 's,^currentProject *= *"\([^"]*\)"$,\1,p' $PVSSINST_CONF
sed -n 's,^currentProject *= *"\([^"]*\)"$,\1,p' $PVSSINST_CONF | sort -ur | head -n 1
)
pvss_ii=$(
sed -n '/^\[.*\\'$currentProj'\]$/,/^\[/s,^PVSS_II *= *"\([^"]*\)"$,\1,p' \
......