Merge lp:~slub.team/goobi-production/bug-784584 into lp:goobi-production/1.6

Proposed by Ralf Claussnitzer
Status: Merged
Approved by: Ralf Claussnitzer
Approved revision: 29
Merged at revision: 29
Proposed branch: lp:~slub.team/goobi-production/bug-784584
Merge into: lp:goobi-production/1.6
Diff against target: 149 lines (+129/-0)
4 files modified
scripts/script_createDirMeta.sh (+31/-0)
scripts/script_createDirUserHome.sh (+35/-0)
scripts/script_createSymLink.sh (+33/-0)
scripts/script_deleteSymLink.sh (+30/-0)
To merge this branch: bzr merge lp:~slub.team/goobi-production/bug-784584
Reviewer Review Type Date Requested Status
Ralf Claussnitzer (community) Approve
Review via email: mp+61567@code.launchpad.net

Commit message

fixes lp784584

Description of the change

Fixes bug lp784584.

To post a comment you must log in.
Revision history for this message
Ralf Claussnitzer (ralf-claussnitzer-deactivatedaccount) wrote :

Calling bash scripts from a Java Servlet container is the opposite of platform independence.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'scripts'
2=== added file 'scripts/script_createDirMeta.sh'
3--- scripts/script_createDirMeta.sh 1970-01-01 00:00:00 +0000
4+++ scripts/script_createDirMeta.sh 2011-05-19 13:31:17 +0000
5@@ -0,0 +1,31 @@
6+#!/bin/bash
7+#
8+# This file is part of the Goobi Application - a Workflow tool for the support of
9+# mass digitization.
10+#
11+# Visit the websites for more information.
12+# - http://gdz.sub.uni-goettingen.de
13+# - http://www.goobi.org
14+# - http://launchpad.net/goobi-production
15+#
16+# This program is free software; you can redistribute it and/or modify it under
17+# the terms of the GNU General Public License as published by the Free Software
18+# Foundation; either version 2 of the License, or (at your option) any later
19+# version.
20+#
21+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
22+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
23+# PARTICULAR PURPOSE. See the GNU General Public License for more details. You
24+# should have received a copy of the GNU General Public License along with this
25+# program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
26+# Suite 330, Boston, MA 02111-1307 USA
27+#
28+
29+#
30+# Note: Ensure that Tomcat has permission to execute the given commands.
31+#
32+
33+Directory="$1"
34+
35+/bin/mkdir -vm 0775 "$Directory"
36+
37
38=== added file 'scripts/script_createDirUserHome.sh'
39--- scripts/script_createDirUserHome.sh 1970-01-01 00:00:00 +0000
40+++ scripts/script_createDirUserHome.sh 2011-05-19 13:31:17 +0000
41@@ -0,0 +1,35 @@
42+#!/bin/bash
43+#
44+# This file is part of the Goobi Application - a Workflow tool for the support of
45+# mass digitization.
46+#
47+# Visit the websites for more information.
48+# - http://gdz.sub.uni-goettingen.de
49+# - http://www.goobi.org
50+# - http://launchpad.net/goobi-production
51+#
52+# This program is free software; you can redistribute it and/or modify it under
53+# the terms of the GNU General Public License as published by the Free Software
54+# Foundation; either version 2 of the License, or (at your option) any later
55+# version.
56+#
57+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
58+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
59+# PARTICULAR PURPOSE. See the GNU General Public License for more details. You
60+# should have received a copy of the GNU General Public License along with this
61+# program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
62+# Suite 330, Boston, MA 02111-1307 USA
63+#
64+
65+#
66+# Note: Ensure that Tomcat has permission to execute the given commands.
67+#
68+
69+User="$1"
70+Home="$2"
71+
72+/bin/mkdir "$Home"
73+/bin/chmod g+w "$Home"
74+/bin/chown $User "$Home"
75+/bin/chgrp tomcat "$Home"
76+
77
78=== added file 'scripts/script_createSymLink.sh'
79--- scripts/script_createSymLink.sh 1970-01-01 00:00:00 +0000
80+++ scripts/script_createSymLink.sh 2011-05-19 13:31:17 +0000
81@@ -0,0 +1,33 @@
82+#!/bin/bash
83+#
84+# This file is part of the Goobi Application - a Workflow tool for the support of
85+# mass digitization.
86+#
87+# Visit the websites for more information.
88+# - http://gdz.sub.uni-goettingen.de
89+# - http://www.goobi.org
90+# - http://launchpad.net/goobi-production
91+#
92+# This program is free software; you can redistribute it and/or modify it under
93+# the terms of the GNU General Public License as published by the Free Software
94+# Foundation; either version 2 of the License, or (at your option) any later
95+# version.
96+#
97+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
98+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
99+# PARTICULAR PURPOSE. See the GNU General Public License for more details. You
100+# should have received a copy of the GNU General Public License along with this
101+# program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
102+# Suite 330, Boston, MA 02111-1307 USA
103+#
104+
105+#
106+# Note: Ensure that Tomcat has permission to execute the given commands.
107+#
108+
109+Source="$1"
110+Target="$2"
111+User="$3"
112+
113+/bin/ln -vs "$Source" "$Target"
114+/bin/chown -vR "$User" "$Source"
115
116=== added file 'scripts/script_deleteSymLink.sh'
117--- scripts/script_deleteSymLink.sh 1970-01-01 00:00:00 +0000
118+++ scripts/script_deleteSymLink.sh 2011-05-19 13:31:17 +0000
119@@ -0,0 +1,30 @@
120+#!/bin/bash
121+#
122+# This file is part of the Goobi Application - a Workflow tool for the support of
123+# mass digitization.
124+#
125+# Visit the websites for more information.
126+# - http://gdz.sub.uni-goettingen.de
127+# - http://www.goobi.org
128+# - http://launchpad.net/goobi-production
129+#
130+# This program is free software; you can redistribute it and/or modify it under
131+# the terms of the GNU General Public License as published by the Free Software
132+# Foundation; either version 2 of the License, or (at your option) any later
133+# version.
134+#
135+# This program is distributed in the hope that it will be useful, but WITHOUT ANY
136+# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
137+# PARTICULAR PURPOSE. See the GNU General Public License for more details. You
138+# should have received a copy of the GNU General Public License along with this
139+# program; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
140+# Suite 330, Boston, MA 02111-1307 USA
141+#
142+
143+#
144+# Note: Ensure that Tomcat has permission to execute the given commands.
145+#
146+
147+Link="$1"
148+
149+rm -v "$Link"

Subscribers

People subscribed via source and target branches

to all changes: