2011-12-27 Paolo Bonzini
* kernel/VFSZip.st: Use it instead of #%. Reported by Maarten van Beek.
* scripts/Package.st: Use it instead of #%.
2011-12-27 Paolo Bonzini
* VFS.st: Use #system:withArguments: instead of #%.
Reported by Maarten van Beek.
diff --git a/kernel/VFSZip.st b/kernel/VFSZip.st
index 7be9a75..0347c93 100644
--- a/kernel/VFSZip.st
+++ b/kernel/VFSZip.st
@@ -57,8 +57,8 @@ files from a ZIP archive.'>
Smalltalk
- system: 'unzip -p %1 %2 > %3' %
- {self file name.
+ system: 'unzip -p %1 %2 > %3'
+ withArguments: {self file name.
anArchiveMember name.
temp name}
]
@@ -68,8 +68,8 @@ files from a ZIP archive.'>
Smalltalk
- system: 'zip -d %1 %2' %
- {self file name.
+ system: 'zip -d %1 %2'
+ withArguments: {self file name.
anArchiveMember name}
]
diff --git a/packages/vfs/VFS.st b/packages/vfs/VFS.st
index cf02bd2..373c61e 100644
--- a/packages/vfs/VFS.st
+++ b/packages/vfs/VFS.st
@@ -104,8 +104,8 @@ Commander and with GNOME VFS.'>
Smalltalk
- system: '%1 mkdir %2 %3' %
- {command.
+ system: '%1 mkdir %2 %3'
+ withArguments: {command.
self file name.
dirName}
]
@@ -133,8 +133,8 @@ Commander and with GNOME VFS.'>
Smalltalk
- system: '%1 copyout %2 %3 %4' %
- {command.
+ system: '%1 copyout %2 %3 %4'
+ withArguments: {command.
self file name.
anArchiveMember name.
file name}
@@ -149,8 +149,8 @@ Commander and with GNOME VFS.'>
ifTrue: ['rmdir']
ifFalse: ['rm'].
Smalltalk
- system: '%1 %2 %3 %4' %
- {command.
+ system: '%1 %2 %3 %4'
+ withArguments: {command.
subcmd.
self file name.
anArchiveMember name}
@@ -163,8 +163,8 @@ Commander and with GNOME VFS.'>
Smalltalk
- system: '%1 copyin %2 %3 %4' %
- {command.
+ system: '%1 copyin %2 %3 %4'
+ withArguments: {command.
self file name.
anArchiveMember name.
anArchiveMember file name}
diff --git a/scripts/Package.st b/scripts/Package.st
index 009755c..e5b8dff 100644
--- a/scripts/Package.st
+++ b/scripts/Package.st
@@ -382,7 +382,9 @@ File extend [
Command
execute: [
Directory working: dir name.
- Smalltalk system: '%1 -n .st:.xml -qr %2 .' % { Command zip. self }
+ Smalltalk
+ system: '%1 -n .st:.xml -qr %2 .'
+ withArguments: { Command zip. self }
]
ensure: [ Directory working: saveDir ]
]
@@ -729,12 +731,14 @@ PackageCommand subclass: PkgInstall [
self packages
do: [ :each | packageList := packageList, ' ', each name ].
- Smalltalk system: (pat % {
- gstLoad.
- File image.
- Directory kernel.
- (self isOption: 'test') ifTrue: [ '--test' ] ifFalse: [ '' ].
- packageList })
+ Smalltalk
+ system: pat
+ withArguments: {
+ gstLoad.
+ File image.
+ Directory kernel.
+ (self isOption: 'test') ifTrue: [ '--test' ] ifFalse: [ '' ].
+ packageList }
]
tmpDir [