This commit was manufactured by cvs2svn to create tag 'RELEASE_1_0_BETA_2'.v1.0-beta2

11 files changed, 11 insertions, 11 deletions

diff --git a/tests/include/testcontrol.sh b/tests/include/testcontrol.sh
index b53f148..cdd1610 100644
--- a/tests/include/testcontrol.sh
+++ b/tests/include/testcontrol.sh
@@ -107,7 +107,7 @@ test_setup() {
 	export XDG_TEST_TMPDIR="$TMPSUBDIR"
 	cd "$XDG_TEST_TMPDIR"
 	
-	get_shortid "$XDG_TEST_DIR/tmp/shortid-$UID"
+	get_shortid "$XDG_TEST_DIR/tmp/shortid"
 	export XDG_TEST_SHORTID="$SHORTID"
 }
 
diff --git a/tests/xdg-desktop-menu/t.02-menu_system_as_nonroot b/tests/xdg-desktop-menu/t.02-menu_system_as_nonroot
index 7c972e9..5308af9 100755
--- a/tests/xdg-desktop-menu/t.02-menu_system_as_nonroot
+++ b/tests/xdg-desktop-menu/t.02-menu_system_as_nonroot
@@ -7,7 +7,7 @@
 
 ## Test function
 test_menu_system_as_nonroot() {
-USERPATH="${XDG_DATA_DIRS-/usr/local/share:/usr/share}:$HOME/.local:$HOME/.config:$XDG_DATA_HOME"
+USERPATH="$XDG_DATA_DIRS:$HOME/.local:$HOME/.config:$XDG_DATA_HOME"
 
 ## Begin the test.
 test_start "$FUNCNAME: verify error for --mode system when run as a normal user"
diff --git a/tests/xdg-desktop-menu/t.20-simple_menu_item_system_install b/tests/xdg-desktop-menu/t.20-simple_menu_item_system_install
index 84f89b8..eda90cc 100755
--- a/tests/xdg-desktop-menu/t.20-simple_menu_item_system_install
+++ b/tests/xdg-desktop-menu/t.20-simple_menu_item_system_install
@@ -13,7 +13,7 @@ test_start "$FUNCNAME: verify a desktop file is installed in the system applicat
 test_init
 
 # Generate .desktop file
-USERPATH="${XDG_DATA_DIRS-/usr/local/share:/usr/share}:${XDG_CONFIG_DIRS-/etc/xdg}"
+USERPATH="$XDG_DATA_DIRS:$XDG_CONFIG_DIRS"
 
 require_root
 set_no_display
diff --git a/tests/xdg-desktop-menu/t.21-simple_menu_item_system_uninstall b/tests/xdg-desktop-menu/t.21-simple_menu_item_system_uninstall
index 6c832a9..d9c0922 100755
--- a/tests/xdg-desktop-menu/t.21-simple_menu_item_system_uninstall
+++ b/tests/xdg-desktop-menu/t.21-simple_menu_item_system_uninstall
@@ -13,7 +13,7 @@ test_start "$FUNCNAME: verify a desktop file is uninstalled from the system appl
 test_init
 
 # Generate .desktop file
-USERPATH="${XDG_DATA_DIRS-/usr/local/share:/usr/share}:${XDG_CONFIG_DIRS-/etc/xdg}"
+USERPATH="$XDG_DATA_DIRS:$XDG_CONFIG_DIRS"
 
 require_root
 set_no_display
diff --git a/tests/xdg-desktop-menu/t.22-menu_system_install b/tests/xdg-desktop-menu/t.22-menu_system_install
index 63a4c7b..19d8304 100755
--- a/tests/xdg-desktop-menu/t.22-menu_system_install
+++ b/tests/xdg-desktop-menu/t.22-menu_system_install
@@ -12,7 +12,7 @@ test_start "$FUNCNAME: verify a system menu is created correctly"
 # Dependencies section
 test_init
 
-USERPATH="${XDG_DATA_DIRS-/usr/local/share:/usr/share}:${XDG_CONFIG_DIRS-/etc/xdg}"
+USERPATH="$XDG_DATA_DIRS:$XDG_CONFIG_DIRS"
 
 require_root
 set_no_display
diff --git a/tests/xdg-desktop-menu/t.23-menu_system_uninstall b/tests/xdg-desktop-menu/t.23-menu_system_uninstall
index 421f831..aa7e56b 100755
--- a/tests/xdg-desktop-menu/t.23-menu_system_uninstall
+++ b/tests/xdg-desktop-menu/t.23-menu_system_uninstall
@@ -15,7 +15,7 @@ test_init
 require_root
 set_no_display
 
-USERPATH="${XDG_DATA_DIRS-/usr/local/share:/usr/share}:${XDG_CONFIG_DIRS-/etc/xdg}"
+USERPATH="$XDG_DATA_DIRS:$XDG_CONFIG_DIRS"
 
 # Generate .desktop file
 use_file "$XDG_TEST_DIR/xdg-desktop-menu/data/menu_item_test.desktop" DESKTOP
diff --git a/tests/xdg-icon-resource/t.icon_svg_system_install b/tests/xdg-icon-resource/t.icon_svg_system_install
index c5dccdc..a87d118 100755
--- a/tests/xdg-icon-resource/t.icon_svg_system_install
+++ b/tests/xdg-icon-resource/t.icon_svg_system_install
@@ -12,7 +12,7 @@ ICON="red-SVG.svg"
 test_start "$FUNCNAME: verify $ICON is installed correctly with --mode system"
 
 ## Begin the test.
-systempath="${XDG_DATA_DIRS-/usr/local/share:/usr/share}:/usr/share/pixmaps"
+systempath="$XDG_DATA_DIRS:/usr/share/pixmaps"
 
 # Dependencies section
 test_init
diff --git a/tests/xdg-icon-resource/t.icon_svg_system_uninstall b/tests/xdg-icon-resource/t.icon_svg_system_uninstall
index c0b9f6b..1f16f6d 100755
--- a/tests/xdg-icon-resource/t.icon_svg_system_uninstall
+++ b/tests/xdg-icon-resource/t.icon_svg_system_uninstall
@@ -13,7 +13,7 @@ test_start "$FUNCNAME: verify $ICON is uninstalled correctly with --mode system"
 
 ## Begin the test.
 icondir="$XDG_TEST_DIR/icons"
-systempath="${XDG_DATA_DIRS-/usr/local/share:/usr/share}:/usr/share/pixmaps"
+systempath="$XDG_DATA_DIRS:/usr/share/pixmaps"
 
 # Dependencies section
 test_init
diff --git a/tests/xdg-icon-resource/t.icon_system_as_nonroot b/tests/xdg-icon-resource/t.icon_system_as_nonroot
index a9d46f7..8c62ba3 100755
--- a/tests/xdg-icon-resource/t.icon_system_as_nonroot
+++ b/tests/xdg-icon-resource/t.icon_system_as_nonroot
@@ -7,7 +7,7 @@
 
 ## Test function
 test_icon_system_as_nonroot() {
-ICON_PATH="$HOME/.icons:${XDG_DATA_DIRS-/usr/local/share:/usr/share}:/usr/share/pixmaps:$HOME/.local/icons:$XDG_DATA_HOME"
+ICON_PATH="$HOME/.icons:$XDG_DATA_DIRS:/usr/share/pixmaps:$HOME/.local/icons:$XDG_DATA_HOME"
 
 ## Begin the test.
 test_start "$FUNCNAME: verify error for --mode system when run as a normal user"
diff --git a/tests/xdg-icon-resource/t.icon_system_install b/tests/xdg-icon-resource/t.icon_system_install
index 4f0dd07..a7e7150 100755
--- a/tests/xdg-icon-resource/t.icon_system_install
+++ b/tests/xdg-icon-resource/t.icon_system_install
@@ -11,7 +11,7 @@ test_start "$FUNCNAME: verify $ICON is installed correctly with --mode system"
 
 ## Begin the test.
 icondir="$XDG_TEST_DIR/icons"
-systempath="${XDG_DATA_DIRS-/usr/local/share:/usr/share}:/usr/share/pixmaps"
+systempath="$XDG_DATA_DIRS:/usr/share/pixmaps"
 
 # Dependencies section
 test_init
diff --git a/tests/xdg-icon-resource/t.icon_system_uninstall b/tests/xdg-icon-resource/t.icon_system_uninstall
index 86477c7..3114edd 100755
--- a/tests/xdg-icon-resource/t.icon_system_uninstall
+++ b/tests/xdg-icon-resource/t.icon_system_uninstall
@@ -9,7 +9,7 @@ test_icon_system_uninstall() {
 test_start "$FUNCNAME: verify $ICON is uninstalled correctly with --mode system"
 
 ## Begin the test.
-systempath="${XDG_DATA_DIRS-/usr/local/share:/usr/share}:/usr/share/pixmaps"
+systempath="$XDG_DATA_DIRS:/usr/share/pixmaps"
 
 # Dependencies section
 test_init