more cleanup

rubygem-aruba.spec

@@ -4,7 +4,7 @@
 Summary: CLI Steps for Cucumber, hand-crafted for you in Aruba
 Name: rubygem-%{gem_name}
 Version: 0.14.7
-Release: 2%{?dist}
+Release: 3%{?dist}
 # aruba itself is MIT
 # icons in templates/images are CC-BY
 # jquery.js itself is MIT or GPLv2
@@ -99,18 +99,25 @@ sed -i features/steps/command/shell.feature \
 	-e '\@echo.*Hello.*c@s|echo|echo -e|'
 
 # /usr/bin/python is reporting deprecation warning :/
-sed -i 's/python/python3/' features/steps/command/shell.feature
-sed -i "s/'python'/'python3'/" features/step_definitions/hooks.rb
-sed -i "s/\.]/.\\\d]/" lib/aruba/generators/script_file.rb
-sed -i "/[^-]python/ s/python/python3/" features/getting_started/run_commands.feature
+if ! grep -q python3 features/steps/command/shell.feature
+then
+	sed -i features/steps/command/shell.feature -e 's|python|python3|'
+	sed -i features/steps/command/shell.feature -e "s|python'|python3'|"
+	sed -i lib/aruba/generators/script_file.rb  \
+		-e '\@interpreter@s|A-Z|A-Z0-9|'
+	sed -i features/getting_started/run_commands.feature \
+		-e '\@[^-]python@s|python|python3|'
+fi
 
 # Get rid of Bundler
-sed -i '/bundler/I s/^/#/' Rakefile
+sed -i Rakefile -e '\@[Bb]undler@d'
 
 # Adjust test cases referring to $HOME.
-sed -i "s|/home/\[\^/\]+|$(echo $HOME)|" features/api/core/expand_path.feature
-sed -i "/Scenario: Default value/,/Scenario/ s|/home/|$(echo $HOME)|" features/configuration/home_directory.feature
-sed -i "/Scenario: Set to aruba's working directory/,/Scenario/ s|/home/|$(echo $HOME)/|" features/configuration/home_directory.feature
+sed -i features/api/core/expand_path.feature -e "s|/home/\[\^/\]+|$(echo $HOME)|" 
+sed -i features/configuration/home_directory.feature \
+	-e "\@Scenario: Default value@,\@Scenario@s|/home/|$(echo $HOME)|"
+sed -i features/configuration/home_directory.feature \
+	-e "\@Set to aruba's working directory@,\@Scenario@s|/home/|$(echo $HOME)/|"
 
 # Make the Aruba always awailable.
 RUBYOPT=-I$(pwd)/lib cucumber
@@ -136,6 +143,9 @@ popd
 %{gem_instdir}/templates/
 
 %changelog
+* Tue Feb 26 2019 Mamoru TASAKA <mtasaka@fedoraproject.org> - 0.14.7-3
+- Some cleanup
+
 * Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.14.7-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild