diff options
| author | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 15:33:06 +0100 |
|---|---|---|
| committer | Stefan Wintermeyer <stefan.wintermeyer@amooma.de> | 2013-01-22 15:33:06 +0100 |
| commit | 39aa7132ceed3d4beab3a9b828e571bbfc67c07e (patch) | |
| tree | 6c88289c9f99be0af8635636fcdf64102090e5ec /script | |
| parent | 5ad8203ce4f1bfea997960d0b52c626dea24b944 (diff) | |
| parent | 6f69c1a85055ec7c2515719d79d2a7a4e60cec50 (diff) | |
Merge branch 'develop'5.1-beta1
Diffstat (limited to 'script')
| -rwxr-xr-x | script/fax_new | 2 | ||||
| -rwxr-xr-x | script/fax_new.sh | 4 | ||||
| -rwxr-xr-x | script/logout_phones.sh | 4 | ||||
| -rwxr-xr-x | script/voicemail_new.sh | 4 |
4 files changed, 1 insertions, 13 deletions
diff --git a/script/fax_new b/script/fax_new index 8015da8..125632c 100755 --- a/script/fax_new +++ b/script/fax_new @@ -63,7 +63,7 @@ system "tiff2pdf \\ -o \"#{pdf_file}\" \\ -p #{paper_size} \\ -a \"#{fax_arguments[:remote_station_id]}\" \\ - -c \"AMOOMA Gemeinschaft version #{GEMEINSCHAFT_VERSION}\" \\ + -c \"AMOOMA Gemeinschaft version #{GsParameter.get('GEMEINSCHAFT_VERSION')}\" \\ -t \"#{fax_arguments[:remote_station_id]}\" \"#{tiff_file}\"" if !File.exists?( pdf_file ) diff --git a/script/fax_new.sh b/script/fax_new.sh deleted file mode 100755 index 3c98d41..0000000 --- a/script/fax_new.sh +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/bash -cd /opt/GS5/script/ -source /usr/local/rvm/scripts/rvm -/opt/GS5/script/fax_new "$@" diff --git a/script/logout_phones.sh b/script/logout_phones.sh deleted file mode 100755 index 2a1a54e..0000000 --- a/script/logout_phones.sh +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/bash -cd /opt/GS5/script/ -source /usr/local/rvm/scripts/rvm -/opt/GS5/script/logout_phones $@ diff --git a/script/voicemail_new.sh b/script/voicemail_new.sh deleted file mode 100755 index dcb29f5..0000000 --- a/script/voicemail_new.sh +++ /dev/null @@ -1,4 +0,0 @@ -#! /bin/bash - -source /usr/local/rvm/scripts/rvm -/opt/GS5/script/voicemail_new $@ |